Remove dead code

Change-Id: I0dc0b7e62c5653107879bab6e3f60603416db3b0
3 files changed