Remove references to Search Model