Remove more dead code.

Test: treehugger
Change-Id: I2b7f606241cde2c2743d8021fad00d30f7e0b0de
3 files changed