Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
@@ -1,17 +0,0 @@
-{
-	"pair": "pair_walls_01",
-	"genericName": "Rubble Materials",
-	"description": "Using rubble materials reduces the costs and build times of walls.",
-	"cost": { "food": 0, "wood": 200, "stone": 0, "metal": 0 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "stone_blocks_brown.png",
-	"researchTime": 40,
-	"tooltip": "Walls −20% build time, but −1 crush armor.",
-	"modifications": [
-		{ "value": "Armour/Crush", "add": -1 },
-		{ "value": "Cost/BuildTime", "multiply": 0.8 }
-	],
-	"affects": ["Wall"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
@@ -1,17 +0,0 @@
-{
-	"pair": "pair_walls_01",
-	"genericName": "Geometric Masonry",
-	"description": "Using geometric masonry increases the sturdiness of defensive walls.",
-	"cost": { "food": 0, "wood": 0, "stone": 200, "metal": 0 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "stone_blocks.png",
-	"researchTime": 40,
-	"tooltip": "Walls +2 crush armor, but +10% build time.",
-	"modifications": [
-		{ "value": "Armour/Crush", "add": 2 },
-		{ "value": "Cost/BuildTime", "multiply": 1.1 }
-	],
-	"affects": ["Wall"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json
@@ -1,6 +0,0 @@
-{
-	"genericName": "Wall armor vs build time.",
-	"top": "buildtime_walls_rubble",
-	"bottom": "health_walls_geometric_masonry",
-	"requirements": { "notciv": "iber" }
-}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
@@ -11,11 +11,6 @@
   <Obstruction>
     <Static width="10" depth="10"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -pair_walls_01
-    </Technologies>
-  </ProductionQueue>
   <StatusBars>
     <HeightOffset>14</HeightOffset>
   </StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
@@ -22,6 +22,7 @@
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
+  <ProductionQueue disable=""/>
   <Repairable>
     <RepairTimeRatio>4.5</RepairTimeRatio>
   </Repairable>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
@@ -30,7 +30,6 @@
   <Obstruction>
     <Static disable=""/>
   </Obstruction>
-  <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
@@ -28,7 +28,6 @@
   <Loot>
     <stone>7</stone>
   </Loot>
-  <ProductionQueue disable=""/>
   <Upgrade>
     <Gate>
       <Entity>structures/{civ}_wall_gate</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml
@@ -27,7 +27,6 @@
   <Loot>
     <stone>5</stone>
   </Loot>
-  <ProductionQueue disable=""/>
   <VisualActor>
     <FoundationActor>structures/fndn_6x3_wall.xml</FoundationActor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
@@ -16,7 +16,6 @@
   <Loot>
     <stone>3</stone>
   </Loot>
-  <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3_wall.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -63,11 +63,6 @@
   <Obstruction>
     <ControlPersist/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      pair_walls_01
-    </Technologies>
-  </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tower.xml</select>