cleanup configs to allow modular creation