Removed a lot of code that was already commented out.