Search method cleanup