Cleaned up a bunch of commented out code.