Remove dead code

Change-Id: I3e387acda9b519252e545ae10778312ef3d86500