DMAAP-84 adding SONAR and cleanup