Remove dead code

Change-Id: I66bec3975b3f028081071b9bbd26206ec369da26
2 files changed