Are all the commented out methods being left in for a specific reason?