Removing old config classes and cleaning up config creation