AID-48 Simplify config file and prepare for use of config.yml in production.