Remove commented out code
sonar fixes