Support cleaning up and merging config files