Moved away configurator stuff