remove some dead code

Change-Id: I0b546b5a5cc87dc988a439914b58029848a4710c
wip

Change-Id: I6604b217b7fc3aea16545fb1f116946ebf95b5fd