More "sonar" cleanup hits