cleanup wait.for residue