removed the commented code