Remove dead code

Bug: 6148388
Change-Id: I5b08d6534a794361e67ba2ad72148fed10a5b148
3 files changed