diff --git a/common/main/ast.xml b/common/main/ast.xml
index 4a63f1aad54..a1126cfdd90 100644
--- a/common/main/ast.xml
+++ b/common/main/ast.xml
@@ -5588,11 +5588,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora estándar d’Alaska</standard>
 					<daylight>Hora braniega d’Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -5607,11 +5602,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora estándar central norteamericana</standard>
 					<daylight>Hora braniega central norteamericana</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -5619,11 +5609,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora estándar del este norteamericanu</standard>
 					<daylight>Hora braniega del este norteamericanu</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -5631,11 +5616,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora estándar de les montañes norteamericanes</standard>
 					<daylight>Hora braniega de les montañes norteamericanes</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -5643,11 +5623,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora estándar del Pacíficu norteamericanu</standard>
 					<daylight>Hora braniega del Pacíficu norteamericanu</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -5697,11 +5672,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora estándar del Atlánticu</standard>
 					<daylight>Hora braniega del Atlánticu</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -6005,11 +5975,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora estándar de Hawaii-Aleutianes</standard>
 					<daylight>Hora braniega de Hawaii-Aleutianes</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard draft="contributed">HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/ba.xml b/common/main/ba.xml
index 8dc89e2caca..42a7d91b6ed 100644
--- a/common/main/ba.xml
+++ b/common/main/ba.xml
@@ -4946,11 +4946,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Аляска стандарт ваҡыты</standard>
 					<daylight>Аляска йәйге ваҡыты</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -4965,11 +4960,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Үҙәк Америка стандарт ваҡыты</standard>
 					<daylight>Үҙәк Америка йәйге ваҡыты</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -4977,11 +4967,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Көнсығыш Америка стандарт ваҡыты</standard>
 					<daylight>Көнсығыш Америка йәйге ваҡыты</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -4989,11 +4974,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Төньяҡ Америка Тау стандарт ваҡыты</standard>
 					<daylight>Төньяҡ Америка Тау йәйге ваҡыты</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -5001,11 +4981,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Тымыҡ океан стандарт ваҡыты</standard>
 					<daylight>Тымыҡ океан йәйге ваҡыты</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
diff --git a/common/main/cs.xml b/common/main/cs.xml
index bd14c523105..152997b052d 100644
--- a/common/main/cs.xml
+++ b/common/main/cs.xml
@@ -8598,11 +8598,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>aljašský standardní čas</standard>
 					<daylight>aljašský letní čas</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -8617,11 +8612,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>severoamerický centrální standardní čas</standard>
 					<daylight>severoamerický centrální letní čas</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -8629,11 +8619,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>severoamerický východní standardní čas</standard>
 					<daylight>severoamerický východní letní čas</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -8641,11 +8626,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>severoamerický horský standardní čas</standard>
 					<daylight>severoamerický horský letní čas</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -8653,11 +8633,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>severoamerický pacifický standardní čas</standard>
 					<daylight>severoamerický pacifický letní čas</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -8707,11 +8682,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>atlantický standardní čas</standard>
 					<daylight>atlantický letní čas</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
diff --git a/common/main/cv.xml b/common/main/cv.xml
index 8b5147dbb9a..97c714e05c9 100644
--- a/common/main/cv.xml
+++ b/common/main/cv.xml
@@ -9868,51 +9868,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Акри стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Акри ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ACT Acre</generic>
-					<standard draft="contributed">ACT Acre</standard>
-					<daylight draft="contributed">ACST Acre</daylight>
-				</short>
 			</metazone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>Афганистан вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">AFT</standard>
-				</short>
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
 					<standard>Вӑта Африка вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">CAT</standard>
-				</short>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
 					<standard>Тухӑҫ Африка вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">EAT</standard>
-				</short>
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
 					<standard>Кӑнтӑр Африка вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">SAST</standard>
-				</short>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
 					<standard>Анӑҫ Африка стандартлӑ вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">WAT</standard>
-				</short>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
@@ -9920,11 +9900,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Аляска стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Аляска ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -9932,11 +9907,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Амазонка стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Амазонка ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AMT</generic>
-					<standard draft="contributed">AMT</standard>
-					<daylight draft="contributed">AMST</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
@@ -9944,11 +9914,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Вӑта Америка стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Вӑта Америка ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -9956,11 +9921,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Тухӑҫ Америка стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Тухӑҫ Америка ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -9968,11 +9928,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ту стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Ту ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -9980,11 +9935,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Лӑпкӑ океан стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Лӑпкӑ океан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -10004,11 +9954,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Апиа стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Апиа ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SST Samoa Apia</generic>
-					<standard draft="contributed">SST Samoa Apia</standard>
-					<daylight draft="contributed">SST Samoa Apia DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
@@ -10016,11 +9961,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Сауд Аравийӗ стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Сауд Аравийӗ ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AST Arabia</generic>
-					<standard draft="contributed">AST Arabia</standard>
-					<daylight draft="contributed">ADT Arabia</daylight>
-				</short>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
@@ -10028,11 +9968,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Аргентина стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Аргентина ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ART</generic>
-					<standard draft="contributed">ART</standard>
-					<daylight draft="contributed">ARST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
@@ -10040,11 +9975,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Анӑҫ Аргентина стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Анӑҫ Аргентина ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">WART</generic>
-					<standard draft="contributed">WART</standard>
-					<daylight draft="contributed">WARST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
@@ -10052,11 +9982,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Армени стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Армени ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AMT Armenia</generic>
-					<standard draft="contributed">AMT Armenia</standard>
-					<daylight draft="contributed">AMST Armenia</daylight>
-				</short>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
@@ -10064,11 +9989,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Атлантика стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Атлантика ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -10076,11 +9996,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Вӑта Австрали стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Вӑта Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ACST</generic>
-					<standard draft="contributed">ACST</standard>
-					<daylight draft="contributed">ACDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
@@ -10088,11 +10003,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Анӑҫ Вӑта Австрали стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Анӑҫ Вӑта Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ACWST</generic>
-					<standard draft="contributed">ACWST</standard>
-					<daylight draft="contributed">ACWDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
@@ -10100,11 +10010,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Тухӑҫ Австрали стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Тухӑҫ Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AEST</generic>
-					<standard draft="contributed">AEST</standard>
-					<daylight draft="contributed">AEDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
@@ -10112,11 +10017,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Анӑҫ Австрали стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Анӑҫ Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AWST</generic>
-					<standard draft="contributed">AWST</standard>
-					<daylight draft="contributed">AWDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
@@ -10124,11 +10024,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Азербайджан стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Азербайджан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AZT</generic>
-					<standard draft="contributed">AZT</standard>
-					<daylight draft="contributed">AZST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Azores">
 				<long>
@@ -10136,11 +10031,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Азор утравӗсен стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Азор утравӗсен ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AZOT</generic>
-					<standard draft="contributed">AZOT</standard>
-					<daylight draft="contributed">AZOST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
@@ -10148,27 +10038,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Бангладеш стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Бангладеш ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">BST Bangladesh</generic>
-					<standard draft="contributed">BST Bangladesh</standard>
-					<daylight draft="contributed">BDT Bangladesh</daylight>
-				</short>
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
 					<standard>Бутан вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">BTT</standard>
-				</short>
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
 					<standard>Боливи вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">BOT</standard>
-				</short>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
@@ -10176,29 +10055,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Бразили стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Бразили ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">BRT</generic>
-					<standard draft="contributed">BRT</standard>
-					<daylight draft="contributed">BRST</daylight>
-				</short>
 			</metazone>
 			<metazone type="British">
 				<long>
 					<generic>Британи вӑхӑчӗ</generic>
 					<daylight>Британи ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">БВ</generic>
-					<daylight draft="contributed">БСВ</daylight>
-				</short>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
 					<standard>Бруней вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">BNT</standard>
-				</short>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
@@ -10206,27 +10073,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Кабо-Верде стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Кабо-Верде ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CVT</generic>
-					<standard draft="contributed">CVT</standard>
-					<daylight draft="contributed">CVST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Casey">
 				<long>
 					<standard>Кейси вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">CAST</standard>
-				</short>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
 					<standard>Чаморро вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">ChST</standard>
-				</short>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
@@ -10234,11 +10090,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Чатем стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Чатем ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CHAST</generic>
-					<standard draft="contributed">CHAST</standard>
-					<daylight draft="contributed">CHADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Chile">
 				<long>
@@ -10246,11 +10097,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Чили стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Чили ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CLT</generic>
-					<standard draft="contributed">CLT</standard>
-					<daylight draft="contributed">CLST</daylight>
-				</short>
 			</metazone>
 			<metazone type="China">
 				<long>
@@ -10258,27 +10104,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Китай стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Китай ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CST China</generic>
-					<standard draft="contributed">CST China</standard>
-					<daylight draft="contributed">CST China DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
 					<standard>Раштав утравӗ вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">CXT</standard>
-				</short>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
 					<standard>Кокос утравӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">CCT</standard>
-				</short>
 			</metazone>
 			<metazone type="Colombia">
 				<long>
@@ -10286,11 +10121,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Колумби стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Колумби ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">COT</generic>
-					<standard draft="contributed">COT</standard>
-					<daylight draft="contributed">COST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Cook">
 				<long>
@@ -10298,11 +10128,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Кук утравӗсен стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Кук утравӗсен ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CKT</generic>
-					<standard draft="contributed">CKT</standard>
-					<daylight draft="contributed">CKT DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
@@ -10310,35 +10135,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Куба стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Куба ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CST Cuba</generic>
-					<standard draft="contributed">CST Cuba</standard>
-					<daylight draft="contributed">CDT Cuba</daylight>
-				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
 					<standard>Дейвис вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">DAVT</standard>
-				</short>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
 					<standard>Дюмон-д’Юрвиль вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">DDUT</standard>
-				</short>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
 					<standard>Тухӑҫ Тимор вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">TLT</standard>
-				</short>
 			</metazone>
 			<metazone type="Easter">
 				<long>
@@ -10346,19 +10157,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Мӑн кун утравӗн стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Мӑн кун утравӗн ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">EAST</generic>
-					<standard draft="contributed">EAST</standard>
-					<daylight draft="contributed">EASST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
 					<standard>Эквадор вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">ECT Ecuador</standard>
-				</short>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
@@ -10410,11 +10213,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Фолкленд утравӗсен стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Фолкленд утравӗсен ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">FKT</generic>
-					<standard draft="contributed">FKT</standard>
-					<daylight draft="contributed">FKST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
@@ -10422,43 +10220,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Фиджи стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Фиджи ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">FJT</generic>
-					<standard draft="contributed">FJT</standard>
-					<daylight draft="contributed">FJT Summer</daylight>
-				</short>
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
 					<standard>Франци Гвианин вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">GFT</standard>
-				</short>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
 					<standard>Франци Кӑнтӑрпа Антарктика территорийӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">TAAF</standard>
-				</short>
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
 					<standard>Галапагос вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">GALT</standard>
-				</short>
 			</metazone>
 			<metazone type="Gambier">
 				<long>
 					<standard>Гамбье вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">GAMT</standard>
-				</short>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
@@ -10466,19 +10247,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Грузи стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Грузи ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">GET</generic>
-					<standard draft="contributed">GET</standard>
-					<daylight draft="contributed">GEST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
 					<standard>Гилберт утравӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">GIT</standard>
-				</short>
 			</metazone>
 			<metazone type="GMT">
 				<long>
@@ -10494,11 +10267,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гренланди стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Гренланди ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">GNST</generic>
-					<standard draft="contributed">GNST</standard>
-					<daylight draft="contributed">GNSST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
@@ -10506,11 +10274,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Тухӑҫ Гренланди стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Тухӑҫ Гренланди ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">EGT</generic>
-					<standard draft="contributed">EGT</standard>
-					<daylight draft="contributed">EGST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
@@ -10518,35 +10281,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Анӑҫ Гринланди стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Анӑҫ ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">WGT</generic>
-					<standard draft="contributed">WGT</standard>
-					<daylight draft="contributed">WGST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
 					<standard>Перс кӳлмекӗн вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">GST Gulf</standard>
-				</short>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
 					<standard>Гайана вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">GYT</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii">
 				<long>
 					<standard>Гавайи стандартлӑ вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">HST</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -10554,11 +10303,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гавайи-Алеут стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Гавайи-Алеут ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard draft="contributed">HAST</standard>
-					<daylight draft="contributed">HDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
@@ -10566,11 +10310,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гонконг стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Гонконг ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HKT</generic>
-					<standard draft="contributed">HKT</standard>
-					<daylight draft="contributed">HKT DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
@@ -10578,59 +10317,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ховд стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Ховд ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HOVT</generic>
-					<standard draft="contributed">HOVT</standard>
-					<daylight draft="contributed">HOVST</daylight>
-				</short>
 			</metazone>
 			<metazone type="India">
 				<long>
 					<standard>Инди вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">IST Indian</standard>
-				</short>
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
 					<standard>Инди океанӗ вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">IOT</standard>
-				</short>
 			</metazone>
 			<metazone type="Indochina">
 				<long>
 					<standard>Индокитай вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">ICT</standard>
-				</short>
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
 					<standard>Вӑта Индонези вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">CIT</standard>
-				</short>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
 					<standard>Тухӑҫ Индонези вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">EIT</standard>
-				</short>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
 					<standard>Анӑҫ Индонези вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">WIT</standard>
-				</short>
 			</metazone>
 			<metazone type="Iran">
 				<long>
@@ -10638,21 +10354,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Иран стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Иран ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">IRST</generic>
-					<standard draft="contributed">IRST</standard>
-					<daylight draft="contributed">IRST DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Irish">
 				<long>
 					<generic>Ирланди вӑхӑчӗ</generic>
 					<daylight>Ирланди стандартлӑ вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ИВ</generic>
-					<daylight draft="contributed">ИСВ</daylight>
-				</short>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
@@ -10672,11 +10379,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Израиль стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Израиль ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">IST Israel</generic>
-					<standard draft="contributed">IST Israel</standard>
-					<daylight draft="contributed">IDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Japan">
 				<long>
@@ -10684,11 +10386,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Япони стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Япони ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">JST</generic>
-					<standard draft="contributed">JST</standard>
-					<daylight draft="contributed">JST DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Kamchatka">
 				<long>
@@ -10732,19 +10429,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Корея стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Корея ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">KST</generic>
-					<standard draft="contributed">KST</standard>
-					<daylight draft="contributed">KST DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
 					<standard>Косрае вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">KOST</standard>
-				</short>
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
@@ -10762,17 +10451,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Кӑркӑстан вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">KGT</standard>
-				</short>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
 					<standard>Лайн утравӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">LINT</standard>
-				</short>
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
@@ -10780,11 +10463,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Лорд-Хау стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Лорд-Хау ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">LHST</generic>
-					<standard draft="contributed">LHST</standard>
-					<daylight draft="contributed">LHST Summer</daylight>
-				</short>
 			</metazone>
 			<metazone type="Magadan">
 				<long>
@@ -10802,33 +10480,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Малайзи вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">MYT</standard>
-				</short>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
 					<standard>Мальдива вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">MVT</standard>
-				</short>
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
 					<standard>Маркизас утравӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">MART</standard>
-				</short>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
 					<standard>Маршалл утравӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">MHT</standard>
-				</short>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
@@ -10836,19 +10502,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Маврики стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Маврики ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MUT</generic>
-					<standard draft="contributed">MUT</standard>
-					<daylight draft="contributed">MUST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Mawson">
 				<long>
 					<standard>Моусон вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">MAWT</standard>
-				</short>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
@@ -10856,11 +10514,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Мексика Лӑпкӑ океан стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Мексика Лӑпкӑ океан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PSTM</generic>
-					<standard draft="contributed">PSTM</standard>
-					<daylight draft="contributed">PDTM</daylight>
-				</short>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
@@ -10868,11 +10521,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Улан-Батор стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Улан-Батор ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ULAT</generic>
-					<standard draft="contributed">ULAT</standard>
-					<daylight draft="contributed">ULAST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
@@ -10890,25 +10538,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Мьянма вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">MMT</standard>
-				</short>
 			</metazone>
 			<metazone type="Nauru">
 				<long>
 					<standard>Науру вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">NRT</standard>
-				</short>
 			</metazone>
 			<metazone type="Nepal">
 				<long>
 					<standard>Непал вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">NPT</standard>
-				</short>
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
@@ -10916,11 +10555,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ҫӗнӗ Каледони стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Ҫӗнӗ Каледони ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">NCT</generic>
-					<standard draft="contributed">NCT</standard>
-					<daylight draft="contributed">NDT New Caledonia</daylight>
-				</short>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
@@ -10928,11 +10562,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ҫӗнӗ Зеланди стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Ҫӗнӗ Зеланди ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">NZST</generic>
-					<standard draft="contributed">NZST</standard>
-					<daylight draft="contributed">NZDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
@@ -10940,19 +10569,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ньюфаундленд стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Ньюфаундленд ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">NST</generic>
-					<standard draft="contributed">NST</standard>
-					<daylight draft="contributed">NDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Niue">
 				<long>
 					<standard>Ниуэ вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">NUT</standard>
-				</short>
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
@@ -10960,11 +10581,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Норфолк стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Норфолк ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">NFT</generic>
-					<standard draft="contributed">NFT</standard>
-					<daylight draft="contributed">NFDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
@@ -10972,11 +10588,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Фернанду-ди-Норонья стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Фернанду-ди-Норонья ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">FNT</generic>
-					<standard draft="contributed">FNT</standard>
-					<daylight draft="contributed">FNST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
@@ -11008,27 +10619,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Пакистан стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Пакистан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PKT</generic>
-					<standard draft="contributed">PKT</standard>
-					<daylight draft="contributed">PKT DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Palau">
 				<long>
 					<standard>Палау вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">PWT</standard>
-				</short>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
 					<standard>Папуа — Ҫӗнӗ Гвинея вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">PGT</standard>
-				</short>
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
@@ -11036,11 +10636,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Парагвай стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Парагвай ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PYT</generic>
-					<standard draft="contributed">PYT</standard>
-					<daylight draft="contributed">PYST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Peru">
 				<long>
@@ -11048,11 +10643,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Перу стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Перу ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PET</generic>
-					<standard draft="contributed">PET</standard>
-					<daylight draft="contributed">EDT Peru</daylight>
-				</short>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
@@ -11060,19 +10650,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Филиппин стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Филиппин ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PST Philippine</generic>
-					<standard draft="contributed">PST Philippine</standard>
-					<daylight draft="contributed">PST Philippine DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
 					<standard>Феникс утравӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">PHOT</standard>
-				</short>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
@@ -11080,51 +10662,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Сен-Пьерпа Микелон стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Сен-Пьерпа Микелон ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PMST</generic>
-					<standard draft="contributed">PMST</standard>
-					<daylight draft="contributed">PMDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
 					<standard>Питкэрн вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">PST Pitcairn</standard>
-				</short>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
 					<standard>Понпеи вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">PONT</standard>
-				</short>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
 					<standard>Ҫур ҫӗр Корея вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">PYT Korea</standard>
-				</short>
 			</metazone>
 			<metazone type="Reunion">
 				<long>
 					<standard>Реюньон вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">RET</standard>
-				</short>
 			</metazone>
 			<metazone type="Rothera">
 				<long>
 					<standard>Ротера вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">ROTT</standard>
-				</short>
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
@@ -11159,57 +10721,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Сейшел утравӗсен вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">SCT</standard>
-				</short>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
 					<standard>Сингапур вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">SGT</standard>
-				</short>
 			</metazone>
 			<metazone type="Solomon">
 				<long>
 					<standard>Соломон вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">SBT</standard>
-				</short>
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
 					<standard>Кӑнтӑр Георги вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">GST</standard>
-				</short>
 			</metazone>
 			<metazone type="Suriname">
 				<long>
 					<standard>Суринам вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">SRT</standard>
-				</short>
 			</metazone>
 			<metazone type="Syowa">
 				<long>
 					<standard>Сёва вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">SYOT</standard>
-				</short>
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
 					<standard>Таити вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">TAHT</standard>
-				</short>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
@@ -11217,27 +10758,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Тайвань стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Тайвань ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">TWT</generic>
-					<standard draft="contributed">TWT</standard>
-					<daylight draft="contributed">TWT DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
 					<standard>Таджикистан вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">TJT</standard>
-				</short>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
 					<standard>Токелау вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">TKT</standard>
-				</short>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
@@ -11245,19 +10775,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Тонга стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Тонга ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">TOT</generic>
-					<standard draft="contributed">TOT</standard>
-					<daylight draft="contributed">TOST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Truk">
 				<long>
 					<standard>Чуук вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">CHUT</standard>
-				</short>
 			</metazone>
 			<metazone type="Turkey">
 				<long>
@@ -11277,19 +10799,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Туркменистан стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Туркменистан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">TMT</generic>
-					<standard draft="contributed">TMT</standard>
-					<daylight draft="contributed">TMT DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Tuvalu">
 				<long>
 					<standard>Тувалу вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">TVT</standard>
-				</short>
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
@@ -11297,11 +10811,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Уругвай стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Уругвай ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">UYT</generic>
-					<standard draft="contributed">UYT</standard>
-					<daylight draft="contributed">UYST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Urumqi">
 				<long>
@@ -11317,11 +10826,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Узбекистан стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Узбекистан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">UZT</generic>
-					<standard draft="contributed">UZT</standard>
-					<daylight draft="contributed">UZT DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
@@ -11329,19 +10833,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Вануату стандартлӑ вӑхӑчӗ</standard>
 					<daylight>Вануату ҫуллахи вӑхӑчӗ</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">VUT</generic>
-					<standard draft="contributed">VUT</standard>
-					<daylight draft="contributed">VUT DST</daylight>
-				</short>
 			</metazone>
 			<metazone type="Venezuela">
 				<long>
 					<standard>Венесуэла вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">VnzlT</standard>
-				</short>
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
@@ -11371,25 +10867,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Восток вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">VOST</standard>
-				</short>
 			</metazone>
 			<metazone type="Wake">
 				<long>
 					<standard>Уэйк утравӗ вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">WAKT</standard>
-				</short>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
 					<standard>Уоллиспа Футуна вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">WFT</standard>
-				</short>
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
@@ -11419,9 +10906,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Юкон вӑхӑчӗ</standard>
 				</long>
-				<short>
-					<standard draft="contributed">YST</standard>
-				</short>
 			</metazone>
 		</timeZoneNames>
 	</dates>
diff --git a/common/main/eu.xml b/common/main/eu.xml
index 12d9596c8ad..c7017d0b74e 100644
--- a/common/main/eu.xml
+++ b/common/main/eu.xml
@@ -9435,11 +9435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Alaskako ordu estandarra</standard>
 					<daylight>Alaskako udako ordua</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -9454,11 +9449,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ipar Amerikako erdialdeko ordu estandarra</standard>
 					<daylight>Ipar Amerikako erdialdeko udako ordua</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -9466,11 +9456,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ipar Amerikako ekialdeko ordu estandarra</standard>
 					<daylight>Ipar Amerikako ekialdeko udako ordua</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -9478,11 +9463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ipar Amerikako mendialdeko ordu estandarra</standard>
 					<daylight>Ipar Amerikako mendialdeko udako ordua</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -9490,11 +9470,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ipar Amerikako Pazifikoko ordu estandarra</standard>
 					<daylight>Ipar Amerikako Pazifikoko udako ordua</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -9544,11 +9519,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ipar Amerikako Atlantikoko ordu estandarra</standard>
 					<daylight>Ipar Amerikako Atlantikoko udako ordua</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
diff --git a/common/main/fr_GF.xml b/common/main/fr_GF.xml
index c767d963292..cadf79e28e6 100644
--- a/common/main/fr_GF.xml
+++ b/common/main/fr_GF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision$"/>
+		<version number="$"/>
 		<language type="fr"/>
 		<territory type="GF"/>
 	</identity>
@@ -18,6 +18,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>GFT</standard>
 				</short>
 			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
 		</timeZoneNames>
 	</dates>
 </ldml>
diff --git a/common/main/ga.xml b/common/main/ga.xml
index ce38c3183e7..505ee82d218 100644
--- a/common/main/ga.xml
+++ b/common/main/ga.xml
@@ -5024,11 +5024,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Am Caighdeánach an Aigéin Chiúin</standard>
 					<daylight>Am Samhraidh an Aigéin Chiúin</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AAC</generic>
-					<standard draft="contributed">ACAC</standard>
-					<daylight draft="contributed">ASAC</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
diff --git a/common/main/gd.xml b/common/main/gd.xml
index 299628237c7..beaab6cebae 100644
--- a/common/main/gd.xml
+++ b/common/main/gd.xml
@@ -6045,11 +6045,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Bun-àm Alaska</standard>
 					<daylight>Tìde samhraidh Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -6064,11 +6059,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Bun-àm Meadhan Aimeireaga</standard>
 					<daylight>Tìde samhraidh Meadhan Aimeireaga</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -6076,11 +6066,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Bun-àm Aimeireaga an Ear</standard>
 					<daylight>Tìde samhraidh Aimeireaga an Ear</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -6088,11 +6073,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Bun-àm Monadh Aimeireaga</standard>
 					<daylight>Tìde samhraidh Monadh Aimeireaga</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -6100,11 +6080,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Bun-àm a’ Chuain Shèimh</standard>
 					<daylight>Tìde samhraidh a’ Chuain Shèimh</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -6154,11 +6129,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Bun-àm a’ Chuain Shiar</standard>
 					<daylight>Tìde samhraidh a’ Chuain Shiar</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -6470,11 +6440,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Bun-àm nan Eileanan Hawai’i ’s Aleutach</standard>
 					<daylight>Tìde Samhraidh nan Eileanan Hawai’i ’s Aleutach</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard draft="contributed">HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/id.xml b/common/main/id.xml
index b13e8262efe..62ba7770270 100644
--- a/common/main/id.xml
+++ b/common/main/id.xml
@@ -6194,11 +6194,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Alaska</standard>
 					<daylight>Waktu Musim Panas Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -6213,11 +6208,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Tengah</standard>
 					<daylight>Waktu Musim Panas Tengah</daylight>
 				</long>
-				<short>
-					<generic>CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -6225,11 +6215,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Timur</standard>
 					<daylight>Waktu Musim Panas Timur</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -6237,11 +6222,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Pegunungan</standard>
 					<daylight>Waktu Musim Panas Pegunungan</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -6249,11 +6229,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Pasifik</standard>
 					<daylight>Waktu Musim Panas Pasifik</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -6303,11 +6278,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Atlantik</standard>
 					<daylight>Waktu Musim Panas Atlantik</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -6454,11 +6424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Kuba</standard>
 					<daylight>Waktu Musim Panas Kuba</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT (Kuba)</generic>
-					<standard draft="contributed">CST (Kuba)</standard>
-					<daylight draft="contributed">CDT (Kuba)</daylight>
-				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
@@ -6577,11 +6542,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Greenland Timur</standard>
 					<daylight>Waktu Musim Panas Greenland Timur</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">EGT</generic>
-					<standard draft="contributed">EGST</standard>
-					<daylight draft="contributed">EGDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
@@ -6604,9 +6564,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<standard>Waktu Hawaii</standard>
 				</long>
-				<short>
-					<standard>HST</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -6614,11 +6571,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Hawaii-Aleutian</standard>
 					<daylight>Waktu Musim Panas Hawaii-Aleutian</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard>HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
@@ -6860,11 +6812,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Newfoundland</standard>
 					<daylight>Waktu Musim Panas Newfoundland</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">NT</generic>
-					<standard draft="contributed">NST</standard>
-					<daylight draft="contributed">NDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Niue">
 				<long>
@@ -6948,11 +6895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Standar Saint Pierre dan Miquelon</standard>
 					<daylight>Waktu Musim Panas Saint Pierre dan Miquelon</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PMT</generic>
-					<standard draft="contributed">PMST</standard>
-					<daylight draft="contributed">PMDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
diff --git a/common/main/nl.xml b/common/main/nl.xml
index 9757a951669..8723f7b0444 100644
--- a/common/main/nl.xml
+++ b/common/main/nl.xml
@@ -9796,11 +9796,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Alaska-standaardtijd</standard>
 					<daylight>Alaska-zomertijd</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -9815,11 +9810,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Central-standaardtijd</standard>
 					<daylight>Central-zomertijd</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -9827,11 +9817,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Eastern-standaardtijd</standard>
 					<daylight>Eastern-zomertijd</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -9839,11 +9824,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mountain-standaardtijd</standard>
 					<daylight>Mountain-zomertijd</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -9851,11 +9831,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Pacific-standaardtijd</standard>
 					<daylight>Pacific-zomertijd</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -9905,11 +9880,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Atlantic-standaardtijd</standard>
 					<daylight>Atlantic-zomertijd</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -10214,9 +10184,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<standard>Hawaii-standaardtijd</standard>
 				</long>
-				<short>
-					<standard>HST</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -10224,11 +10191,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hawaii-Aleoetische standaardtijd</standard>
 					<daylight>Hawaii-Aleoetische zomertijd</daylight>
 				</long>
-				<short>
-					<generic>HAT</generic>
-					<standard>HAST</standard>
-					<daylight>HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/nl_AW.xml b/common/main/nl_AW.xml
index b0d2b5633e5..0adb4aa71c0 100644
--- a/common/main/nl_AW.xml
+++ b/common/main/nl_AW.xml
@@ -7,10 +7,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision$"/>
+		<version number="$"/>
 		<language type="nl"/>
 		<territory type="AW"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<currencies>
 			<currency type="AWG">
diff --git a/common/main/nl_BQ.xml b/common/main/nl_BQ.xml
index 6b50a78c34f..ea742f55b64 100644
--- a/common/main/nl_BQ.xml
+++ b/common/main/nl_BQ.xml
@@ -7,10 +7,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision$"/>
+		<version number="$"/>
 		<language type="nl"/>
 		<territory type="BQ"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<currencies>
 			<currency type="USD">
diff --git a/common/main/nl_CW.xml b/common/main/nl_CW.xml
index d375d725c16..5798683c875 100644
--- a/common/main/nl_CW.xml
+++ b/common/main/nl_CW.xml
@@ -7,10 +7,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision$"/>
+		<version number="$"/>
 		<language type="nl"/>
 		<territory type="CW"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<currencies>
 			<currency type="ANG">
diff --git a/common/main/nl_SR.xml b/common/main/nl_SR.xml
index 64dd81fe007..9fa8951ac5f 100644
--- a/common/main/nl_SR.xml
+++ b/common/main/nl_SR.xml
@@ -7,12 +7,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision$"/>
+		<version number="$"/>
 		<language type="nl"/>
 		<territory type="SR"/>
 	</identity>
 	<dates>
 		<timeZoneNames>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
 			<metazone type="Suriname">
 				<short>
 					<standard>SRT</standard>
diff --git a/common/main/nl_SX.xml b/common/main/nl_SX.xml
index 5ed41423460..0321b05c3af 100644
--- a/common/main/nl_SX.xml
+++ b/common/main/nl_SX.xml
@@ -7,10 +7,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision$"/>
+		<version number="$"/>
 		<language type="nl"/>
 		<territory type="SX"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<currencies>
 			<currency type="ANG">
diff --git a/common/main/no.xml b/common/main/no.xml
index 3d4c370f302..3dedad94663 100644
--- a/common/main/no.xml
+++ b/common/main/no.xml
@@ -8692,11 +8692,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>normaltid for Alaska</standard>
 					<daylight>sommertid for Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -8711,11 +8706,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>normaltid for det sentrale Nord-Amerika</standard>
 					<daylight>sommertid for det sentrale Nord-Amerika</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -8723,11 +8713,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>normaltid for den nordamerikanske østkysten</standard>
 					<daylight>sommertid for den nordamerikanske østkysten</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -8735,11 +8720,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>normaltid for Rocky Mountains (USA)</standard>
 					<daylight>sommertid for Rocky Mountains (USA)</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -8747,11 +8727,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>normaltid for den nordamerikanske Stillehavskysten</standard>
 					<daylight>sommertid for den nordamerikanske Stillehavskysten</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -8801,11 +8776,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>normaltid for den nordamerikanske atlanterhavskysten</standard>
 					<daylight>sommertid for den nordamerikanske atlanterhavskysten</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -9110,9 +9080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<standard>normaltid for Hawaii/Aleutene</standard>
 				</long>
-				<short>
-					<standard>HST</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -9120,11 +9087,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>normaltid for Hawaii og Aleutene</standard>
 					<daylight>sommertid for Hawaii og Aleutene</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard>HDT</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/om.xml b/common/main/om.xml
index ff4006d70dd..9926c983ef3 100644
--- a/common/main/om.xml
+++ b/common/main/om.xml
@@ -3358,11 +3358,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Sa’aatii Istaandaardii Alaaskaa</standard>
 					<daylight>Sa’aatii Guyyaa Alaaskaa</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -3377,11 +3372,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Sa’aatii Istaandaardii Gidduugaleessaa</standard>
 					<daylight>Sa’aatii Guyyaa Gidduugaleessaa</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -3389,11 +3379,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Sa’aatii Istaandaardii Bahaa</standard>
 					<daylight>Sa’aatii Guyyaa Bahaa</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -3401,11 +3386,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Sa’aatii Istaandaardii Maawonteen</standard>
 					<daylight>Sa’aatii Guyyaa Maawonteen</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -3413,11 +3393,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Sa’aatii Istaandaardii Paasfiik</standard>
 					<daylight>Sa’aatii Guyyaa Paasfiik</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Apia">
 				<long>
@@ -3460,11 +3435,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Sa’aatii Istaandaardii Atilaantiik</standard>
 					<daylight>Sa’aatii Guyyaa Atilaantiik</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
diff --git a/common/main/pt_CV.xml b/common/main/pt_CV.xml
index b1e09ba87ee..3aac0b165e3 100644
--- a/common/main/pt_CV.xml
+++ b/common/main/pt_CV.xml
@@ -20,7 +20,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<timeZoneNames>
 			<metazone type="Azores">
 				<short>
-					<generic>↑↑↑</generic>
+					<generic>∅∅∅</generic>
 					<standard>∅∅∅</standard>
 					<daylight>∅∅∅</daylight>
 				</short>
diff --git a/common/main/pt_GQ.xml b/common/main/pt_GQ.xml
index 76b8fb3d389..982091a16a3 100644
--- a/common/main/pt_GQ.xml
+++ b/common/main/pt_GQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision$"/>
+		<version number="$"/>
 		<language type="pt"/>
 		<territory type="GQ"/>
 	</identity>
@@ -16,4 +16,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="en_US" alt="short">inglês (EUA)</language>
 		</languages>
 	</localeDisplayNames>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Azores">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 </ldml>
diff --git a/common/main/sc.xml b/common/main/sc.xml
index f4623e95c97..6db3bcaeb45 100644
--- a/common/main/sc.xml
+++ b/common/main/sc.xml
@@ -9246,11 +9246,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard de s’Alaska</standard>
 					<daylight>Ora legale de s’Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">OAK</generic>
-					<standard draft="contributed">OIAK</standard>
-					<daylight draft="contributed">OLAK</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -9265,11 +9260,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard tzentrale USA</standard>
 					<daylight>Ora legale tzentrale USA</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">OT</generic>
-					<standard draft="contributed">OIT</standard>
-					<daylight draft="contributed">OLT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -9277,11 +9267,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard orientale USA</standard>
 					<daylight>Ora legale orientale USA</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">OO</generic>
-					<standard draft="contributed">OIO</standard>
-					<daylight draft="contributed">OLO</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -9289,11 +9274,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard Montes Pedrosos USA</standard>
 					<daylight>Ora legale Montes Pedrosos USA</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">OMP</generic>
-					<standard draft="contributed">OIMP</standard>
-					<daylight draft="contributed">OLMP</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -9301,11 +9281,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard de su Patzìficu USA</standard>
 					<daylight>Ora legale de su Patzìficu USA</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">OP</generic>
-					<standard draft="contributed">OIP</standard>
-					<daylight draft="contributed">OLP</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -9355,11 +9330,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard de s’Atlànticu</standard>
 					<daylight>Ora legale de s’Atlànticu</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">OA</generic>
-					<standard draft="contributed">OIA</standard>
-					<daylight draft="contributed">OLA</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -9506,11 +9476,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard de Cuba</standard>
 					<daylight>Ora legale de Cuba</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">OC</generic>
-					<standard draft="contributed">OIC</standard>
-					<daylight draft="contributed">OLC</daylight>
-				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
diff --git a/common/main/scn.xml b/common/main/scn.xml
index e244a8001da..ef60b7b7976 100644
--- a/common/main/scn.xml
+++ b/common/main/scn.xml
@@ -3161,11 +3161,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari di l’Alaska</standard>
 					<daylight>Ura ligali di l’Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -3180,11 +3175,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari cintrali</standard>
 					<daylight>Ura ligali cintrali</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -3192,11 +3182,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari livantina</standard>
 					<daylight>Ura ligali livantina</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -3204,11 +3189,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari dî muntagni</standard>
 					<daylight>Ura ligali dî muntagni</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -3216,11 +3196,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari dû Pacìficu</standard>
 					<daylight>Ura ligali dû Pacìficu</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Apia">
 				<long>
@@ -3263,11 +3238,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari di l’Atlànticu</standard>
 					<daylight>Ura ligali di l’Atlànticu</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -3408,11 +3378,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari di Cubba</standard>
 					<daylight>Ura ligali di Cubba</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CuT</generic>
-					<standard draft="contributed">CuST</standard>
-					<daylight draft="contributed">CuDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
@@ -3553,9 +3518,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Ura sulari di l’Hawaai</standard>
 				</long>
-				<short>
-					<standard draft="contributed">HAST</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -3563,11 +3525,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ura sulari di l’Hawaai</standard>
 					<daylight>Ura ligali di l’Hawaai</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard draft="contributed">HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/so.xml b/common/main/so.xml
index 03aa428f6c9..f38604881ad 100644
--- a/common/main/so.xml
+++ b/common/main/so.xml
@@ -8276,11 +8276,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Waqtiga Caadiga ah ee Hawaii-Aleutian</standard>
 					<daylight>Waqtiga Dharaarta ee Hawaay-Alutiyaan</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard>HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/trv.xml b/common/main/trv.xml
index 699a422d292..2a3a4b561be 100644
--- a/common/main/trv.xml
+++ b/common/main/trv.xml
@@ -423,11 +423,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Con-Amarika</standard>
 					<daylight draft="provisional">Jikan Con-Amarika o Karat Rbagan</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JCA</generic>
-					<standard draft="provisional">SJCA</standard>
-					<daylight draft="provisional">JCAKR</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -435,11 +430,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Ton-Amarika</standard>
 					<daylight draft="provisional">Jikan Ton-Amarika o Karat Rbagan</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JTA</generic>
-					<standard draft="provisional">SJTA</standard>
-					<daylight draft="provisional">JTAKR</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -447,11 +437,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Yama-Amarika</standard>
 					<daylight draft="provisional">Jikan Hidaw niq Yama-Amarika</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JYA</generic>
-					<standard draft="provisional">SJYA</standard>
-					<daylight draft="provisional">JHYA</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -459,11 +444,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Amarika-Daybinyan</standard>
 					<daylight draft="provisional">Jikan Amarika-Daybinyan o Karat Rbagan</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JD</generic>
-					<standard draft="provisional">SJAD</standard>
-					<daylight draft="provisional">JADKR</daylight>
-				</short>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
@@ -471,11 +451,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Yayun Tasiyan</standard>
 					<daylight draft="provisional">Jikan Yayun Tasiyan o Karat Rbagan</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JYT</generic>
-					<standard draft="provisional">SJYT</standard>
-					<daylight draft="provisional">JYTKR</daylight>
-				</short>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
@@ -483,11 +458,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Conow</standard>
 					<daylight draft="provisional">Jikan Conow o Karat Rbagan</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JC</generic>
-					<standard draft="provisional">JC</standard>
-					<daylight draft="provisional">JCKR</daylight>
-				</short>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
@@ -495,11 +465,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Tonow</standard>
 					<daylight draft="provisional">Jikan Tonow o Karat Rbagan</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JT</generic>
-					<standard draft="provisional">JT</standard>
-					<daylight draft="provisional">JTKR</daylight>
-				</short>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
@@ -507,11 +472,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="provisional">Snegun Jikan Siow</standard>
 					<daylight draft="provisional">Jikan Siow o Karat Rbagan</daylight>
 				</long>
-				<short>
-					<generic draft="provisional">JS</generic>
-					<standard draft="provisional">JS</standard>
-					<daylight draft="provisional">JSKR</daylight>
-				</short>
 			</metazone>
 			<metazone type="GMT">
 				<long>
diff --git a/common/main/vi.xml b/common/main/vi.xml
index 084a70e9cda..91639ba07e7 100644
--- a/common/main/vi.xml
+++ b/common/main/vi.xml
@@ -6193,11 +6193,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ chuẩn Alaska</standard>
 					<daylight>Giờ mùa hè Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -6212,11 +6207,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ chuẩn miền Trung</standard>
 					<daylight>Giờ mùa hè miền Trung</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -6224,11 +6214,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ chuẩn miền Đông</standard>
 					<daylight>Giờ mùa hè miền Đông</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -6236,11 +6221,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ chuẩn miền núi</standard>
 					<daylight>Giờ mùa hè miền núi</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -6248,11 +6228,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ chuẩn Thái Bình Dương</standard>
 					<daylight>Giờ mùa hè Thái Bình Dương</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -6302,11 +6277,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ chuẩn Đại Tây Dương</standard>
 					<daylight>Giờ mùa hè Đại Tây Dương</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -6593,9 +6563,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<standard>Giờ Hawaii</standard>
 				</long>
-				<short>
-					<standard>HST</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -6603,11 +6570,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ chuẩn Hawaii-Aleut</standard>
 					<daylight>Giờ mùa hè Hawaii-Aleut</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard>HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/zh_Hant.xml b/common/main/zh_Hant.xml
index 76421553078..281d06b583d 100644
--- a/common/main/zh_Hant.xml
+++ b/common/main/zh_Hant.xml
@@ -8921,11 +8921,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>阿拉斯加標準時間</standard>
 					<daylight>阿拉斯加夏令時間</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AKT</generic>
-					<standard draft="contributed">AKST</standard>
-					<daylight draft="contributed">AKDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -8940,11 +8935,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>中部標準時間</standard>
 					<daylight>中部夏令時間</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">CT</generic>
-					<standard draft="contributed">CST</standard>
-					<daylight draft="contributed">CDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -8952,11 +8942,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>東部標準時間</standard>
 					<daylight>東部夏令時間</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">ET</generic>
-					<standard draft="contributed">EST</standard>
-					<daylight draft="contributed">EDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -8964,11 +8949,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>山區標準時間</standard>
 					<daylight>山區夏令時間</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">MT</generic>
-					<standard draft="contributed">MST</standard>
-					<daylight draft="contributed">MDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -8976,11 +8956,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>太平洋標準時間</standard>
 					<daylight>太平洋夏令時間</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">PT</generic>
-					<standard draft="contributed">PST</standard>
-					<daylight draft="contributed">PDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -9030,11 +9005,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>大西洋標準時間</standard>
 					<daylight>大西洋夏令時間</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">AT</generic>
-					<standard draft="contributed">AST</standard>
-					<daylight draft="contributed">ADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -9324,9 +9294,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<standard>夏威夷時間</standard>
 				</long>
-				<short>
-					<standard>HST</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -9334,11 +9301,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>夏威夷-阿留申標準時間</standard>
 					<daylight>夏威夷-阿留申夏令時間</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard>HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
diff --git a/common/main/zh_Hant_HK.xml b/common/main/zh_Hant_HK.xml
index 9a76caafc38..12d2fbc0767 100644
--- a/common/main/zh_Hant_HK.xml
+++ b/common/main/zh_Hant_HK.xml
@@ -9008,11 +9008,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>↑↑↑</standard>
 					<daylight>↑↑↑</daylight>
 				</long>
-				<short>
-					<generic>↑↑↑</generic>
-					<standard>↑↑↑</standard>
-					<daylight>↑↑↑</daylight>
-				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
@@ -9027,11 +9022,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>北美中部標準時間</standard>
 					<daylight>北美中部夏令時間</daylight>
 				</long>
-				<short>
-					<generic>↑↑↑</generic>
-					<standard>↑↑↑</standard>
-					<daylight>↑↑↑</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -9039,11 +9029,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>北美東部標準時間</standard>
 					<daylight>北美東部夏令時間</daylight>
 				</long>
-				<short>
-					<generic>↑↑↑</generic>
-					<standard>↑↑↑</standard>
-					<daylight>↑↑↑</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -9051,11 +9036,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>北美山區標準時間</standard>
 					<daylight>北美山區夏令時間</daylight>
 				</long>
-				<short>
-					<generic>↑↑↑</generic>
-					<standard>↑↑↑</standard>
-					<daylight>↑↑↑</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -9063,11 +9043,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>北美太平洋標準時間</standard>
 					<daylight>北美太平洋夏令時間</daylight>
 				</long>
-				<short>
-					<generic>↑↑↑</generic>
-					<standard>↑↑↑</standard>
-					<daylight>↑↑↑</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -9117,11 +9092,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>↑↑↑</standard>
 					<daylight>↑↑↑</daylight>
 				</long>
-				<short>
-					<generic>↑↑↑</generic>
-					<standard>↑↑↑</standard>
-					<daylight>↑↑↑</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -9411,9 +9381,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>↑↑↑</standard>
 				</long>
-				<short>
-					<standard>↑↑↑</standard>
-				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
@@ -9421,11 +9388,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>↑↑↑</standard>
 					<daylight>↑↑↑</daylight>
 				</long>
-				<short>
-					<generic>↑↑↑</generic>
-					<standard>↑↑↑</standard>
-					<daylight>↑↑↑</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>