Remove depedency on partial_search