more Sonar cleanup