remove some stuff

Change-Id: Ib2b4e2f060e0dbc696ef60d7051c090a30afbaa0