Clean up the configurator code in the CLI app.