Merge "[search] Remove more dead code"