Removed a lot of commented out, and old code.