remove some uses of config.instance