first major configurator cleanup