Remove search logic