Remove search config post-rebasing