Delete dead code

Change-Id: I2830eaed57213f9fc00cac5b9a689b6c7b93341f
7 files changed