lots of sonar violations removed