Add confirm to Configurator and cleanup stuff