...and remove the now, hopefully unneeded workaround for agent.conf, all values are in config.yaml now