Backed out cleanup of config: functions