ADEN-921 wgHighValueCountries clean up
ADEN-1008 Use the new WF function