rm dead code

Change-Id: Ibd084f2ed93566393eed742d7ab291a9a038fdf5