diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml
index 47d72884ee..89f159d877 100644
--- a/mods/d2k/maps/shellmap/map.yaml
+++ b/mods/d2k/maps/shellmap/map.yaml
@@ -111,7 +111,6 @@ Actors:
 	AtreidesSpiceRefinery: refinery
 		Location: 57,58
 		Owner: Atreides
-		FreeActor: false
 
 Smudges:
 
@@ -127,14 +126,6 @@ Rules:
 			Maximum: 1
 		LuaScript:
 			Scripts: shellmap.lua
-	carryall.scripted:
-		Helicopter:
-			LandWhenIdle: True
-		Cargo:
-			Types: Vehicle
-		WithCargo:
-			DisplayTypes: Vehicle
-			LocalOffset: 0,0,-256
 	rockettower:
 		Power:
 			Amount: 100
diff --git a/mods/d2k/maps/shellmap/shellmap.lua b/mods/d2k/maps/shellmap/shellmap.lua
index 8c8ae472c9..6361538ea5 100644
--- a/mods/d2k/maps/shellmap/shellmap.lua
+++ b/mods/d2k/maps/shellmap/shellmap.lua
@@ -1,20 +1,3 @@
-InitializeHarvester = function(harvester)
-	harvester.FindResources()
-	Trigger.OnRemovedFromWorld(harvester, InsertHarvester)
-end
-
-InsertHarvester = function()
-	local harvesters = Reinforcements.ReinforceWithTransport(atreides, "carryall.scripted", { "harvester" },
-		{ Entry.Location, AtreidesSpiceRefinery.Location + CVec.New(2, 3) }, { Entry.Location })[2]
-
-	Utils.Do(harvesters, function(harvester)
-		Trigger.OnAddedToWorld(harvester, function() InitializeHarvester(harvester) end)
-	end)
-end
-
 WorldLoaded = function()
-	atreides = Player.GetPlayer("Atreides")
-
-	InsertHarvester()
 	Media.PlayMusic("score")
-end
+end
\ No newline at end of file
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 9e3504c579..8afebf7d3f 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -1,4 +1,4 @@
-carryall.scripted:
+carryall.reinforce:
 	Inherits: ^Helicopter
 	Valued:
 		Cost: 1200
@@ -10,7 +10,7 @@ carryall.scripted:
 	Armor:
 		Type: Light
 	Helicopter:
-		CruiseAltitude: 2048
+		CruiseAltitude: 2100
 		InitialFacing: 0
 		ROT: 4
 		Speed: 160
@@ -18,7 +18,7 @@ carryall.scripted:
 		RepairBuildings: repair
 		RearmBuildings:
 		Repulsable: False
-		LandAltitude: 512
+		LandAltitude: 100
 		LandWhenIdle: False
 	RenderUnit:
 		Image: carryall
@@ -26,16 +26,17 @@ carryall.scripted:
 	LeavesHusk:
 		HuskActor: carryall.husk
 	-Selectable:
+	-TargetableAircraft:
+	Carryall:
+		Automatic: False
 
 carryall:
-	Inherits: carryall.scripted
+	Inherits: carryall.reinforce
 	Carryall:
+		Automatic: True
 	Buildable:
 		Queue: Aircraft
 		BuildPaletteOrder: 120
-	Helicopter:
-		CruiseAltitude: 2100
-		LandAltitude: 100
 
 carryall.infantry:
 	Inherits: ^Plane
@@ -61,6 +62,7 @@ carryall.infantry:
 		MaxWeight: 5
 		Types: Infantry
 	-Selectable:
+	-TargetableAircraft:
 	-GainsExperience:
 	Tooltip:
 		Name: Carryall