Remove unnecessary commented out code