Remove quoting. Allow CFG to be configured