Remove dependency on catalogsearch