Clean-up, removed commented out methods

Clean-up, removed commented out methods