Remove some dead code

Change-Id: I70179a0e54826c18a35447202ff37346082207a8
Merge "Remove some dead code"