Removed commented out methods