Revert "Config Cleanup"

This reverts commit e3352d27b35efbe592e29ab6c08c50d13253ed04.