Big Cleanup

Removed a large portion of unneeded code and organized it.