Cleaning up some of the commented out code.