Removed commented-out methods