Remove unused code

Test: TreeHugger
Change-Id: If7a4606f5a6a09c574574ed8ed04788435259fa8
4 files changed