country code cleanup