Removed unnecessary commented out code