Rm unused stuff

Change-Id: Ic8837d4de24dacd273450928a88a4362d5a05062