clean up commented out methods