Clean up

Cleared out a lot of the unneeded stuff.