Remove unneeded else/extra search call