Remove crap

Change-Id: I74db975f0fe7bd5a3754a336bafacdfb23aeb5ce