sonar cleanups