Remove calls to Search