Remove a bunch of unused stuff