Silence sonar cleanups