DDF-223 - sonar cleanup