-Removed a bunch of dead and unused code from the previous version.