diff --git a/factions/tech/units/battle_machine/battle_machine.xml b/factions/tech/units/battle_machine/battle_machine.xml
index 0ed2750..817cc83 100644
--- a/factions/tech/units/battle_machine/battle_machine.xml
+++ b/factions/tech/units/battle_machine/battle_machine.xml
@@ -27,7 +27,6 @@
 			<unit name="technodrome"/>
 		</unit-requirements>
 		<upgrade-requirements>
-			<upgrade name="robotics"/>
 		</upgrade-requirements>
 		<resource-requirements>
 			<resource name="wood" amount="150"/>
diff --git a/factions/tech/units/technician/technician.xml b/factions/tech/units/technician/technician.xml
index 9058661..115b1a7 100644
--- a/factions/tech/units/technician/technician.xml
+++ b/factions/tech/units/technician/technician.xml
@@ -197,40 +197,6 @@
 			</sound>
 		</skill>
 
-		<skill>
-			<type value="morph"/>
-			<name value="build_catapult"/>
-			<ep-cost value="0"/>
-			<speed value="500"/>
-			<anim-speed value="200"/>
-			<animation path="models/technician_morphing_catapult.g3d"/>
-			<sound enabled="true" start-time="0">
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build1.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build2.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build3.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build4.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build5.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build6.wav"/>
-			</sound>
-		</skill>
-
-		<skill>
-			<type value="morph"/>
-			<name value="build_battle_machine"/>
-			<ep-cost value="0"/>
-			<speed value="500"/>
-			<anim-speed value="200"/>
-			<animation path="models/technician_morphing_battle_machine.g3d"/>
-			<sound enabled="true" start-time="0">
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build1.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build2.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build3.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build4.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build5.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/technician_build6.wav"/>
-			</sound>
-		</skill>
-
 		<skill>
 			<type value="morph"/>
 			<name value="build_air_ballista"/>
@@ -365,28 +331,6 @@
 			<attack-skill value="molotov_skill"/>
 		</command>
 
-		<command>
-			<type value="morph"/>
-			<name value="build_catapult"/>
-			<image path="../catapult/images/catapult.bmp"/>
-			<unit-requirements/>
-			<upgrade-requirements/>
-			<morph-skill value="build_catapult"/>
-			<morph-unit name= "catapult"/>
-			<discount value="40"/>
-		</command>
-
-		<command>
-			<type value="morph"/>
-			<name value="build_battle_machine"/>
-			<image path="../battle_machine/images/battle_machine.bmp"/>
-			<unit-requirements/>
-			<upgrade-requirements/>
-			<morph-skill value="build_battle_machine"/>
-			<morph-unit name= "battle_machine"/>
-			<discount value="40"/>
-		</command>
-
 		<command>
 			<type value="morph"/>
 			<name value="build_air_ballista"/>
diff --git a/factions/tech/units/technodrome/technodrome.xml b/factions/tech/units/technodrome/technodrome.xml
index eaf590c..b8344cd 100644
--- a/factions/tech/units/technodrome/technodrome.xml
+++ b/factions/tech/units/technodrome/technodrome.xml
@@ -111,14 +111,24 @@
 			<produce-skill value="produce_skill"/>
 			<produced-unit name="technician"/>
 		</command>
+
 		<command>
-			<type value="upgrade"/>
-			<name value="research_advanced_architecture"/>
-			<image path="../../upgrades/advanced_architecture/images/advanced_architecture.bmp"/>
-			<unit-requirements/>
-			<upgrade-requirements/>
-			<upgrade-skill value="upgrade_skill"/>
-			<produced-upgrade name="advanced_architecture"/>
+			<type value="produce"/>
+			<name value="produce_battle_machine"/>
+			<image path="../battle_machine/images/battle_machine.bmp"/>
+			<unit-requirements />
+			<upgrade-requirements />
+			<produce-skill value="produce_skill"/>
+			<produced-unit name="battle_machine"/>
+		</command>
+		<command>
+			<type value="produce"/>
+			<name value="produce_catapult"/>
+			<animation path="models/technician_morphing_catapult.g3d"/>
+			<unit-requirements />
+			<upgrade-requirements />
+			<produce-skill value="produce_skill"/>
+			<produced-unit name="battle_machine"/>
 		</command>
 		<command>
 			<type value="upgrade"/>