Removed/commented out a bunch of unnecessary code.