Remove some dead code from search

Test: rebuild
Change-Id: If736f58c546fa9eafc405525c11640ca2576d446
6 files changed