Merge pull request #14504 from seamuslee001/ref_remove_unneded_search_code_contirbuti...