Remove Ctry Code map, replace with list. Remove safe_cc_only