Get rid of the old search class

Change-Id: I2cef8757f082ea1e44d21d7ec73fd71de83058a3
(cherry picked from commit 929bf8595f0608708c5363cfd33e2eb3cf0db727)
3 files changed