removed sonar violations.