ADEN-921 wgHighValueCountries clean up