Configurator cleanups