cleanup sonar rules