Remove crap

Change-Id: I9de02f619a0b769dc73d1270180637c46a93c840