search cleanup