Remove dead code

Change-Id: Iaeba1c3b90127de7b9b1a468e2252be6a212cf3f
Merge "Remove dead code"