Remove dead code

Test: builds
Change-Id: I35bfebe57805b2a29f8507a39d644a914f02321f
3 files changed