Index: binaries/data/mods/public/simulation/templates/gaia/fauna_camel_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_camel_trainable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_camel">
-  <UnitAI>
-    <DefaultStance>passive</DefaultStance>
-  </UnitAI>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow_trainable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_cattle_cow">
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga_trainable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_cattle_sanga">
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_cattle_zebu">
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_goat_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_goat_trainable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_goat">
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse_trainable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_horse">
-  <UnitAI>
-    <DefaultStance>passive</DefaultStance>
-  </UnitAI>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_pig">
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
@@ -46,9 +46,6 @@
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
   <VisualActor>
     <Actor>fauna/shark.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_sheep_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_sheep_trainable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_sheep">
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-  <VisualActor>
-    <Actor>fauna/sheep1.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/cart/corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/corral.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/corral.xml
@@ -12,8 +12,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_cattle_cow_trainable
-      gaia/fauna_cattle_sanga_trainable
+      -gaia/fauna_cattle_cow
+      gaia/fauna_cattle_sanga
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/kush/corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush/corral.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush/corral.xml
@@ -13,8 +13,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_cattle_cow_trainable
-      gaia/fauna_cattle_sanga_trainable
+      -gaia/fauna_cattle_cow
+      gaia/fauna_cattle_sanga
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur/corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/corral.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/corral.xml
@@ -12,8 +12,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_cattle_cow_trainable
-      gaia/fauna_cattle_zebu_trainable
+      -gaia/fauna_cattle_cow
+      gaia/fauna_cattle_zebu
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol/corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/corral.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/corral.xml
@@ -12,8 +12,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_cattle_cow_trainable
-      gaia/fauna_cattle_sanga_trainable
+      -gaia/fauna_cattle_cow
+      gaia/fauna_cattle_sanga
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -31,10 +31,10 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      gaia/fauna_goat_trainable
-      gaia/fauna_sheep_trainable
-      gaia/fauna_pig_trainable
-      gaia/fauna_cattle_cow_trainable
+      gaia/fauna_goat
+      gaia/fauna_sheep
+      gaia/fauna_pig
+      gaia/fauna_cattle_cow
     </Entities>
     <Technologies datatype="tokens">
       gather_animals_stockbreeding
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -44,9 +44,6 @@
   <UnitMotion>
     <WalkSpeed op="mul">0.7</WalkSpeed>
   </UnitMotion>
-  <Visibility>
-    <RetainInFog>true</RetainInFog>
-  </Visibility>
   <Vision>
     <Range>60</Range>
   </Vision>