Can the commented out code be removed?