[WIP] Remove some of the crap nobody uses

Change-Id: I68cc2449728a32d6c263e659cfcb34a82739a335