remove proprietary search code and import