search: cleanup