@aloof-angle-91616 yes, I think removing those overrides is a good idea. If the tests pass, it should mean that the new paths are good.