Removed a lot of old, commented code