diff --git a/binaries/data/mods/public/simulation/templates/template_entity_full.xml b/binaries/data/mods/public/simulation/templates/template_entity_full.xml
deleted file mode 100644
index 5a24335449..0000000000
--- a/binaries/data/mods/public/simulation/templates/template_entity_full.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity>
-  <AIProxy/>
-  <Looter/>
-  <Ownership/>
-  <Position>
-    <Altitude>0</Altitude>
-    <Anchor>upright</Anchor>
-    <Floating>false</Floating>
-    <FloatDepth>0.0</FloatDepth>
-    <TurnRate>6.0</TurnRate>
-  </Position>
-  <Selectable/>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_entity_quasi.xml b/binaries/data/mods/public/simulation/templates/template_entity_quasi.xml
deleted file mode 100644
index 8c959bf29f..0000000000
--- a/binaries/data/mods/public/simulation/templates/template_entity_quasi.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity>
-  <AIProxy/>
-  <Ownership/>
-  <Position>
-    <Altitude>0</Altitude>
-    <Anchor>upright</Anchor>
-    <Floating>false</Floating>
-    <FloatDepth>0.0</FloatDepth>
-    <TurnRate>6.0</TurnRate>
-  </Position>
-  <Selectable>
-    <EditorOnly/>
-  </Selectable>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia.xml b/binaries/data/mods/public/simulation/templates/template_gaia.xml
index 8e59f473b3..9695e4bf29 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_entity_quasi">
+<Entity>
+  <AIProxy/>
   <Fogging/>
   <Identity>
     <Civ>gaia</Civ>
@@ -17,6 +18,17 @@
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <OverlayRenderer/>
+  <Ownership/>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <FloatDepth>0.0</FloatDepth>
+    <TurnRate>6.0</TurnRate>
+  </Position>
+  <Selectable>
+    <EditorOnly/>
+  </Selectable>
   <StatusBars>
     <BarWidth>2.0</BarWidth>
     <BarHeight>0.333</BarHeight>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml
index 83a1ad4cd9..4b76cd60d9 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_entity_full">
+<Entity>
+  <AIProxy/>
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
@@ -68,6 +69,7 @@
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
+  <Looter/>
   <Minimap>
     <Type>structure</Type>
   </Minimap>
@@ -82,6 +84,14 @@
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <OverlayRenderer/>
+  <Ownership/>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <FloatDepth>0.0</FloatDepth>
+    <TurnRate>6.0</TurnRate>
+  </Position>
   <ProductionQueue>
     <TechCostMultiplier>
       <food>1.0</food>
diff --git a/binaries/data/mods/public/simulation/templates/template_trigger_point.xml b/binaries/data/mods/public/simulation/templates/template_trigger_point.xml
index 075385e025..fe21411ab1 100644
--- a/binaries/data/mods/public/simulation/templates/template_trigger_point.xml
+++ b/binaries/data/mods/public/simulation/templates/template_trigger_point.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_entity_quasi">
+<Entity>
+  <AIProxy/>
   <Footprint>
     <Circle radius="2.0"/>
     <Height>8.0</Height>
   </Footprint>
   <OverlayRenderer/>
+  <Ownership/>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <FloatDepth>0.0</FloatDepth>
+    <TurnRate>6.0</TurnRate>
+  </Position>
   <Selectable>
+    <EditorOnly/>
     <Overlay>
       <Outline>
         <LineTexture>outline_border.png</LineTexture>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 9d1500cabe..81f89a8abf 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_entity_full">
+<Entity>
+  <AIProxy/>
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
@@ -52,6 +53,7 @@
     </Formations>
     <Undeletable>false</Undeletable>
   </Identity>
+  <Looter/>
   <Minimap>
     <Type>unit</Type>
   </Minimap>
@@ -67,6 +69,14 @@
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <OverlayRenderer/>
+  <Ownership/>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <FloatDepth>0.0</FloatDepth>
+    <TurnRate>6.0</TurnRate>
+  </Position>
   <RangeOverlayManager/>
   <RangeOverlayRenderer/>
   <ResourceGatherer>