Remove search singleton again