Remove use of config variable