Remove dead/unused code

Test: make
Bug: 30554873
Change-Id: I102dd03da9fd352e2b410e1bfd97d3289e6b2b26
2 files changed