Remove some unused code

Change-Id: I2883633f63ba470de1d86c6758eba8eed46afb03