Removing use of partial_search