more sonar cleanup