removed all the commented code