removed commented out methods after refactoring