Remove a bunch of stuff we don't need

Change-Id: I0e0047f46a724334e385913e2ac799190c2e3a09
28 files changed