Sonar inspired cleanup