removed commented out methods