Clean up sonar violations