removed sonar violations