Remove unused imports
Move retriever to search