Remove unused shit

Change-Id: I64fc904de3241f76c8b4340043e3adede89e09cf