Clean up new search api.