Remove dead code

Change-Id: If22a6c4e572b0734eba0c5a7ce29a2c61c581e5d
2 files changed