removed commented-out methods