Remove search code