Remove crap

Change-Id: Icb51dfb1d043e0314f4dab3c64d91fd29586eb88