Removed the commented out sections.