Cleaning up

Removed a lot of unneeded things