remove bad stuff

Change-Id: Ib8856868d3f92ae114eea696e2436853abeea154