SONAR-5007 cleanup