removed the commented out code