Removed useless commented out sections