diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
index d1e867f9b7..eebe316d34 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
@@ -5,7 +5,6 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Ruins</GenericName>
     <SpecificName>Ancient Ruins</SpecificName>
     <Icon>gaia/special_fence.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
index 00f5511e9f..3eb58c2641 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
@@ -5,7 +5,6 @@
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Pyramid</GenericName>
     <SpecificName>Great Pyramid</SpecificName>
     <Icon>gaia/special_pyramid.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
index da38c09977..7d82a08f3a 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
@@ -5,7 +5,6 @@
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Pyramid</GenericName>
     <SpecificName>Minor Pyramid</SpecificName>
     <Icon>gaia/special_pyramid.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
index d80324f3d8..a8eac5840f 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
@@ -5,7 +5,6 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Stone Ruins</GenericName>
     <SpecificName>Celtic Standing Stone</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
index 0db5711c35..23c87cd765 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Stone Ruins</GenericName>
     <SpecificName>Ptolemaic Egyptian Statues</SpecificName>
     <Icon>structures/statue.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
index 072f9ea0b2..41ce754c35 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Stone Ruins</GenericName>
     <SpecificName>Kushite Statue</SpecificName>
     <Icon>structures/statue.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
index 09d1643c6c..4bd67655df 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Stone Ruins</GenericName>
     <SpecificName>Roman Statues</SpecificName>
     <Icon>structures/statue.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
index 4817b93629..9768eeb9fe 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Ruins</GenericName>
     <SpecificName>Unfinished Greek Temple</SpecificName>
     <Tooltip>This temple is unfinished and has fallen to ruin.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml
index 1117e68c94..d6bef7756b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml
@@ -5,7 +5,6 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml
index 850954cf8b..c35059cd3d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml
@@ -5,7 +5,6 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Half-buried Barrels</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml
index a1790957a5..1f4eb2f08b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure_food.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml
index df2211a347..7f28ebcd02 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure_food.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml
index 309ccf1113..6f75ffa40e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml
@@ -5,7 +5,6 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
index 830bfe366b..96512c480b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
@@ -5,7 +5,6 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Food Treasure</GenericName>
     <SpecificName>Persian Food Stores</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
index 7dfe7cd09f..07eaae8b0b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Food Treasure</GenericName>
     <SpecificName>Persian Food Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
index 5f9a0e794b..76c36fc56d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
@@ -5,7 +5,6 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Golden Fleece</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml
index bbe0bcea3f..68059e677d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml
@@ -5,7 +5,6 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Metal Treasure</GenericName>
     <SpecificName>Secret Box</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
index 1fb67d9428..f9bad8673e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Metal Treasure</GenericName>
     <SpecificName>Persian Wares</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
index a3f74207b0..34747a98ee 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Metal Treasure</GenericName>
     <SpecificName>Persian Rugs</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
index b187867061..db560020af 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
@@ -5,7 +5,6 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Pegasus</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
index b517156ece..d9dd09df6e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
@@ -5,7 +5,6 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>A decaying military shipwreck. A good opportunity for any businessman.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml
index fa06e9c1fe..252dd46535 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml
@@ -5,7 +5,6 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck Cargo</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
index 226c37f144..500afb184a 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
@@ -5,7 +5,6 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>A shipwreck with much loss of life. A good opportunity for any businessman.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
index aafaf127c9..793b90c825 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
@@ -5,7 +5,6 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>The wreck of a small cargo ship. A good opportunity for any businessman.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
index f29513fd13..5d9a90a0b5 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
@@ -5,7 +5,6 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>A cargo ship rammed in half. A good opportunity for any businessman.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml
index 33b2eb8a12..073bbc6a6e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml
@@ -5,7 +5,6 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Stone Treasure</GenericName>
     <SpecificName>Celtic Standing Stone</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml
index 783675427e..1493aea6eb 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml
@@ -5,7 +5,6 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Stone Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml
index d479aa8e30..5e44e549fa 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Treasure</GenericName>
     <SpecificName>Wood Treasure</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/template_formation.xml b/binaries/data/mods/public/simulation/templates/template_formation.xml
index f944f7480d..4a9b31666a 100644
--- a/binaries/data/mods/public/simulation/templates/template_formation.xml
+++ b/binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -2,7 +2,6 @@
 <Entity>
   <!--
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Formation</GenericName>
     <Undeletable>true</Undeletable>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml
index 8e93374477..83a1ad4cd9 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -56,6 +56,7 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
+    <Civ>gaia</Civ>
     <GenericName>Structure</GenericName>
     <Classes datatype="tokens">Structure ConquestCritical</Classes>
     <Undeletable>false</Undeletable>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
index be61dbef05..43038097d8 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
@@ -30,7 +30,6 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Stoa</GenericName>
     <SpecificName>Hellenic Royal Stoa</SpecificName>
     <Tooltip>Recruit special units.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 9d5137a2f5..9d1500cabe 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -37,6 +37,7 @@
     <Unhealable>false</Unhealable>
   </Health>
   <Identity>
+    <Civ>gaia</Civ>
     <GenericName>Unit</GenericName>
     <Classes datatype="tokens">Unit ConquestCritical</Classes>
     <Formations datatype="tokens">
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml b/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
index 8153e6951d..d17e444e26 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
@@ -11,7 +11,6 @@
     <Square width="5.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <Formations disable=""/>
     <GenericName>Catafalque</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
index 29bab9dbcc..3d57c36429 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -23,7 +23,6 @@
     </Melee>
   </Attack>
   <Identity>
-    <Civ>gaia</Civ>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
index 1e20ff871a..a7ef1e6e32 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
@@ -10,7 +10,6 @@
     <Height>1.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
index dffa8f6b2e..f040a8499f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
@@ -7,7 +7,6 @@
   </Health>
   <Identity>
     <Classes datatype="tokens">SeaCreature</Classes>
-    <Civ>gaia</Civ>
     <GenericName>Cetacean</GenericName>
     <Tooltip>Kill, then gather food from this bountiful oceanic resource.</Tooltip>
     <Icon>gaia/fauna_fish.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
index 090ec679ae..c6c58984a2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
@@ -13,9 +13,6 @@
     <Square width="1.4" depth="2.8"/>
     <Height>1.5</Height>
   </Footprint>
-  <Identity>
-    <Civ>gaia</Civ>
-  </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
index 270e4aeb87..b8811e63f8 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
@@ -18,9 +18,6 @@
   <Health>
     <Max>50</Max>
   </Health>
-  <Identity>
-    <Civ>gaia</Civ>
-  </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
index fa8ccc0a23..dfb5b3b9be 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -8,7 +8,6 @@
     </Resources>
   </Cost>
   <Identity>
-    <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiaphoros</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
index 0a05d04f72..40a232ee47 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -16,7 +16,6 @@
     </Resources>
   </Cost>
   <Identity>
-    <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
index f6646ef709..075f120c7b 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -7,7 +7,6 @@
     </Resources>
   </Cost>
   <Identity>
-    <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
     <SpecificName>Thyreophóros</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
index 740172d667..c513020565 100644
--- a/binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
@@ -5,7 +5,6 @@
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <SpecificName>Mankar Cirya</SpecificName>
     <Icon>units/noldor_ship_bireme.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/plane.xml b/binaries/data/mods/public/simulation/templates/units/plane.xml
index 65d10a77de..428e99f920 100644
--- a/binaries/data/mods/public/simulation/templates/units/plane.xml
+++ b/binaries/data/mods/public/simulation/templates/units/plane.xml
@@ -39,7 +39,6 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
     <SpecificName>P-51 Mustang</SpecificName>
     <Tooltip>A World War 2 American fighter plane.</Tooltip>
     <Icon>units/global_mustang.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
index b9704bc402..1a0fe84ecc 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Samnite Skirmisher</GenericName>
     <SpecificName>Samnite Skirmisher</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
index e045fc1b77..fd7aaaf99c 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman_hoplite">
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Samnite Spearman</GenericName>
     <SpecificName>Samnite Spearman</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
index 6f36e6cd65..2915002840 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Samnite Swordsman</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
diff --git a/binaries/data/mods/public/simulation/templates/units/theb_mechanical_siege_fireraiser.xml b/binaries/data/mods/public/simulation/templates/units/theb_mechanical_siege_fireraiser.xml
index d10bfce38d..3a6a62a016 100644
--- a/binaries/data/mods/public/simulation/templates/units/theb_mechanical_siege_fireraiser.xml
+++ b/binaries/data/mods/public/simulation/templates/units/theb_mechanical_siege_fireraiser.xml
@@ -28,7 +28,6 @@
     <Height>4.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Fire Raiser</GenericName>
     <SpecificName>Pyrobolos</SpecificName>
     <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml b/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml
index 5c897d5769..943d3ecd53 100644
--- a/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml
+++ b/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman_hoplite">
   <Identity>
-    <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Theban Sacred Band Hoplite</GenericName>
     <SpecificName>Hieroû Thebaíou Lókhou Hoplítai</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml b/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml
index 89884cc120..436da59079 100644
--- a/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml
+++ b/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
-    <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Thespian Black Cloak</GenericName>
     <SpecificName>Melanochitones</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/viking_longboat.xml b/binaries/data/mods/public/simulation/templates/units/viking_longboat.xml
index ba50daedea..7af8d25853 100644
--- a/binaries/data/mods/public/simulation/templates/units/viking_longboat.xml
+++ b/binaries/data/mods/public/simulation/templates/units/viking_longboat.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_bireme">
   <Identity>
-    <Civ>gaia</Civ>
     <SpecificName>Longboat</SpecificName>
     <Icon>units/viking_longboat.png</Icon>
   </Identity>