code cleanup, removed commented out methods