Clean up: delete unused methods

Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705
2 files changed