Removed the commented-out code