Auto wave scavenging