removed all the commented out code