clean up commented out code
cleaned up code