Removed the commented code