some cleaning based on sonar scan