Normalizer purged, CountryCodeAdder added