Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
@@ -6,7 +6,6 @@
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
@@ -6,7 +6,6 @@
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
@@ -6,7 +6,6 @@
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
@@ -11,7 +11,6 @@
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
@@ -5,7 +5,6 @@
       structures/brit_crannog
       structures/brit_kennel
       structures/brit_rotarymill
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
@@ -5,7 +5,6 @@
       structures/brit_crannog
       structures/brit_kennel
       structures/brit_rotarymill
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
@@ -5,7 +5,6 @@
       structures/brit_crannog
       structures/brit_kennel
       structures/brit_rotarymill
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml
@@ -6,7 +6,6 @@
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
       structures/cart_embassy_italiote
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
@@ -6,7 +6,6 @@
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
       structures/cart_embassy_italiote
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
@@ -6,7 +6,6 @@
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
       structures/cart_embassy_italiote
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml
@@ -6,7 +6,6 @@
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
       structures/cart_embassy_italiote
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
@@ -6,7 +6,6 @@
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
       structures/cart_embassy_italiote
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
@@ -6,7 +6,6 @@
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
       structures/cart_embassy_italiote
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/maur_elephant_stables
       structures/maur_pillar_ashoka
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/maur_elephant_stables
       structures/maur_pillar_ashoka
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/maur_elephant_stables
       structures/maur_pillar_ashoka
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
@@ -6,7 +6,6 @@
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
@@ -6,7 +6,6 @@
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
@@ -6,7 +6,6 @@
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
@@ -5,7 +5,6 @@
       structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
-      structures/ptol_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
@@ -5,7 +5,6 @@
       structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
-      structures/ptol_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
@@ -5,7 +5,6 @@
       structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
-      structures/ptol_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
@@ -5,7 +5,6 @@
       structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
-      structures/ptol_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
@@ -5,7 +5,6 @@
       structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
-      structures/ptol_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
@@ -5,7 +5,6 @@
       structures/ptol_military_colony
       structures/ptol_lighthouse
       structures/ptol_library
-      structures/ptol_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
@@ -6,7 +6,6 @@
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
@@ -6,7 +6,6 @@
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
@@ -6,7 +6,6 @@
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
-      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/sele_military_colony
       structures/sele_library
-      structures/sele_wonder
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/sele_military_colony
       structures/sele_library
-      structures/sele_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/sele_military_colony
       structures/sele_library
-      structures/sele_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/sele_military_colony
       structures/sele_library
-      structures/sele_wonder
     </Entities>
   </Builder>
   <Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/sele_military_colony
       structures/sele_library
-      structures/sele_wonder
     </Entities>
   </Builder>
   <Cost>