diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
index 0ffe931c3e..1b106912a6 100644
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -332,10 +332,6 @@ Actors:
 		Owner: Nod
 		Health: 0.1875
 		Facing: 160
-	Gunboat: boat
-		Location: 51,59
-		Owner: GDI
-		Facing: 64
 	Actor92: e1
 		Location: 57,45
 		Owner: Nod
@@ -386,9 +382,10 @@ Actors:
 		Owner: Nod
 		Facing: 96
 		SubCell: 4
-	spawn27: waypoint
-		Location: 51,47
-		Owner: Neutral
+	Gunboat: boat
+		Location: 51,59
+		Owner: GDI
+		Facing: 64
 	nod0: waypoint
 		Location: 36,39
 		Owner: Neutral
diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua
index da0355a78d..7cff964b0f 100644
--- a/mods/cnc/maps/gdi02/gdi02.lua
+++ b/mods/cnc/maps/gdi02/gdi02.lua
@@ -49,7 +49,7 @@ NodAttack = function()
 	if #nodUnits > AttackerSquadSize * 2 then
 		local attackers = Utils.Skip(nodUnits, #nodUnits - AttackerSquadSize)
 		Utils.Do(attackers, function(unit)
-			unit.AttackMove(waypoint2.Location)
+			unit.AttackMove(NodAttackWaypoint.Location)
 			Trigger.OnIdle(unit, unit.Hunt)
 		end)
 		Trigger.OnAllKilled(attackers, function() Trigger.AfterDelay(DateTime.Seconds(15), NodAttack) end)
diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml
index 906788583d..dcbfb4019a 100644
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -304,12 +304,6 @@ Actors:
 		Location: 55,51
 		Owner: GDI
 		Health: 0.34375
-	SiloA: silo
-		Location: 57,32
-		Owner: Nod
-	SiloB: silo
-		Location: 59,32
-		Owner: Nod
 	Actor81: nuke
 		Location: 55,32
 		Owner: Nod
@@ -320,9 +314,6 @@ Actors:
 		Location: 53,52
 		Owner: GDI
 		Health: 0.025
-	NodRefinery: proc
-		Location: 57,34
-		Owner: Nod
 	Actor85: bggy
 		Location: 52,39
 		Owner: Nod
@@ -342,11 +333,6 @@ Actors:
 		Owner: Nod
 		Health: 0.578125
 		Facing: 96
-	RushBuggy: bggy
-		Location: 51,50
-		Owner: Nod
-		Health: 0.1835938
-		Facing: 96
 	Actor91: bggy
 		Location: 59,39
 		Owner: Nod
@@ -511,11 +497,6 @@ Actors:
 		Owner: Nod
 		Facing: 160
 		SubCell: 4
-	RushRifle3: e1
-		Location: 52,53
-		Owner: Nod
-		Facing: 32
-		SubCell: 0
 	Actor126: e1
 		Location: 38,49
 		Owner: Nod
@@ -592,18 +573,6 @@ Actors:
 		Owner: Nod
 		Facing: 96
 		SubCell: 4
-	RushRifle1: e1
-		Location: 54,48
-		Owner: Nod
-		Health: 0.4765625
-		Facing: 128
-		SubCell: 3
-	RushRifle2: e1
-		Location: 52,52
-		Owner: Nod
-		Health: 0.3164063
-		Facing: 96
-		SubCell: 0
 	Actor143: e1
 		Location: 48,37
 		Owner: Nod
@@ -634,36 +603,46 @@ Actors:
 		Owner: Nod
 		Facing: 224
 		SubCell: 4
-	waypoint26: waypoint
-		Location: 49,47
-		Owner: Neutral
-	waypoint6: waypoint
-		Location: 54,39
-		Owner: Neutral
-	waypoint5: waypoint
-		Location: 46,37
-		Owner: Neutral
-	waypoint4: waypoint
-		Location: 46,41
-		Owner: Neutral
-	waypoint3: waypoint
-		Location: 59,41
-		Owner: Neutral
-	waypoint2: waypoint
-		Location: 54,55
-		Owner: Neutral
-	waypoint1: waypoint
-		Location: 38,54
-		Owner: Neutral
-	waypoint0: waypoint
-		Location: 35,33
-		Owner: Neutral
+	SiloA: silo
+		Location: 57,32
+		Owner: Nod
+	SiloB: silo
+		Location: 59,32
+		Owner: Nod
+	NodRefinery: proc
+		Location: 57,34
+		Owner: Nod
+	RushBuggy: bggy
+		Location: 51,50
+		Owner: Nod
+		Health: 0.1835938
+		Facing: 96
+	RushRifle1: e1
+		Location: 54,48
+		Owner: Nod
+		Health: 0.4765625
+		Facing: 128
+		SubCell: 3
+	RushRifle2: e1
+		Location: 52,52
+		Owner: Nod
+		Health: 0.3164063
+		Facing: 96
+		SubCell: 0
+	RushRifle3: e1
+		Location: 52,53
+		Owner: Nod
+		Facing: 32
+		SubCell: 0
 	lstEnd: waypoint
 		Location: 58,57
 		Owner: GDI
 	lstStart: waypoint
 		Location: 58,61
 		Owner: GDI
+	NodAttackWaypoint: waypoint
+		Location: 54,55
+		Owner: Neutral
 
 Smudges:
 
diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml
index 8a93ad9fd6..d8fbb2dac4 100644
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -435,22 +435,10 @@ Actors:
 	Actor121: v01
 		Location: 44,54
 		Owner: Neutral
-	Sam1: sam
-		Location: 28,52
-		Owner: Nod
-	Sam2: sam
-		Location: 22,46
-		Owner: Nod
-	Sam3: sam
-		Location: 35,47
-		Owner: Nod
 	Actor125: gun
 		Location: 36,30
 		Owner: Nod
 		Facing: 96
-	Sam4: sam
-		Location: 12,34
-		Owner: Nod
 	Actor127: gun
 		Location: 29,34
 		Owner: Nod
@@ -467,9 +455,6 @@ Actors:
 		Location: 28,50
 		Owner: Nod
 		Facing: 160
-	HiddenBuggy: bggy
-		Location: 6,25
-		Owner: Nod
 	Actor137: bggy
 		Location: 21,30
 		Owner: Nod
@@ -588,16 +573,6 @@ Actors:
 		Owner: Nod
 		Facing: 96
 		SubCell: 3
-	Sam4Guard1: e1
-		Location: 11,31
-		Owner: Nod
-		Facing: 96
-		SubCell: 4
-	Sam4Guard2: e1
-		Location: 10,31
-		Owner: Nod
-		Facing: 96
-		SubCell: 2
 	Actor163: c6
 		Location: 42,56
 		Owner: Neutral
@@ -629,11 +604,6 @@ Actors:
 		Owner: Nod
 		Facing: 96
 		SubCell: 1
-	Sam4Guard0: e1
-		Location: 9,31
-		Owner: Nod
-		Facing: 96
-		SubCell: 1
 	Actor179: e3
 		Location: 13,36
 		Owner: Nod
@@ -681,6 +651,42 @@ Actors:
 		Location: 14,32
 		Owner: Nod
 		SubCell: 4
+	Actor191: e3
+		Location: 24,46
+		Owner: Nod
+		Facing: 128
+		SubCell: 1
+	Sam1: sam
+		Location: 28,52
+		Owner: Nod
+	Sam2: sam
+		Location: 22,46
+		Owner: Nod
+	Sam3: sam
+		Location: 35,47
+		Owner: Nod
+	Sam4: sam
+		Location: 12,34
+		Owner: Nod
+	HiddenBuggy: bggy
+		Location: 6,25
+		Owner: Nod
+		Facing: 0
+	Sam4Guard0: e1
+		Location: 9,31
+		Owner: Nod
+		Facing: 96
+		SubCell: 1
+	Sam4Guard1: e1
+		Location: 11,31
+		Owner: Nod
+		Facing: 96
+		SubCell: 4
+	Sam4Guard2: e1
+		Location: 10,31
+		Owner: Nod
+		Facing: 96
+		SubCell: 2
 	Sam4Guard3: e1
 		Location: 10,31
 		Owner: Nod
@@ -689,11 +695,6 @@ Actors:
 		Location: 10,31
 		Owner: Nod
 		SubCell: 4
-	Actor191: e3
-		Location: 24,46
-		Owner: Nod
-		Facing: 128
-		SubCell: 1
 	InfantryStart: waypoint
 		Location: 14,61
 		Owner: Neutral
diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml
index 62714eab2c..c63f3f55bf 100644
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -224,13 +224,6 @@ Actors:
 	Actor51: nuke
 		Location: 28,54
 		Owner: Nod
-	HandOfNod: hand
-		Location: 30,52
-		Owner: Nod
-	Hunter1: bggy
-		Location: 35,43
-		Owner: Nod
-		Facing: 192
 	Actor54: bggy
 		Location: 55,53
 		Owner: Nod
@@ -242,10 +235,6 @@ Actors:
 	Actor56: jeep
 		Location: 13,53
 		Owner: GDI
-	Hunter2: bggy
-		Location: 32,43
-		Owner: Nod
-		Facing: 192
 	Actor58: bggy
 		Location: 31,57
 		Owner: Nod
@@ -447,26 +436,40 @@ Actors:
 		Owner: Nod
 		Facing: 192
 		SubCell: 3
-	NodHeliLZ3: waypoint
-		Location: 53,32
+	HandOfNod: hand
+		Location: 30,52
+		Owner: Nod
+	Hunter1: bggy
+		Location: 35,43
+		Owner: Nod
+		Facing: 192
+	Hunter2: bggy
+		Location: 32,43
+		Owner: Nod
+		Facing: 192
+	crate: CRATE.plain
+		Location: 25,58
 		Owner: Neutral
-	NodHeliLZ2: waypoint
-		Location: 17,28
+	NodHeliEntry: waypoint
+		Location: 41,23
 		Owner: Neutral
 	NodHeliLZ1: waypoint
 		Location: 31,39
 		Owner: Neutral
-	GDIReinforcementsWP2: waypoint
-		Location: 11,51
+	NodHeliLZ2: waypoint
+		Location: 17,28
 		Owner: Neutral
-	GDIReinforcementsWP1: waypoint
-		Location: 11,52
+	NodHeliLZ3: waypoint
+		Location: 53,32
 		Owner: Neutral
 	GDIReinforcementsEntry: waypoint
 		Location: 7,50
 		Owner: Neutral
-	NodHeliEntry: waypoint
-		Location: 41,23
+	GDIReinforcementsWP1: waypoint
+		Location: 11,52
+		Owner: Neutral
+	GDIReinforcementsWP2: waypoint
+		Location: 11,51
 		Owner: Neutral
 	GDIHeliEntry: waypoint
 		Location: 34,60
@@ -474,9 +477,6 @@ Actors:
 	GDIHeliLZ: waypoint
 		Location: 27,58
 		Owner: Neutral
-	crate: CRATE.plain
-		Location: 25,58
-		Owner: Neutral
 
 Smudges:
 
diff --git a/mods/cnc/maps/gdi04b/gdi04b.lua b/mods/cnc/maps/gdi04b/gdi04b.lua
index c04c2c7844..d7bc55a270 100644
--- a/mods/cnc/maps/gdi04b/gdi04b.lua
+++ b/mods/cnc/maps/gdi04b/gdi04b.lua
@@ -57,7 +57,7 @@ end
 BuildNod1 = function()
 	Build(NodxUnits, false, function(actor)
 		Trigger.OnKilled(actor, KillCounter)
-		actor.Patrol({ waypoint1.Location, waypoint2.Location, waypoint3.Location, waypoint4.Location }, false)
+		actor.Patrol({ NodPatrol1.Location, NodPatrol2.Location, NodPatrol3.Location, NodPatrol4.Location }, false)
 		Trigger.OnIdle(actor, actor.Hunt)
 	end)
 end
@@ -65,7 +65,7 @@ end
 BuildNod2 = function()
 	Build(NodxUnits, false, function(actor)
 		Trigger.OnKilled(actor, KillCounter)
-		actor.Patrol({ waypoint1.Location, waypoint2.Location }, false)
+		actor.Patrol({ NodPatrol1.Location, NodPatrol2.Location }, false)
 		Trigger.OnIdle(actor, actor.Hunt)
 	end)
 end
diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml
index 3fff7a4ce7..a3a22e5f1c 100644
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -329,22 +329,12 @@ Actors:
 	Actor86: t05
 		Location: 35,23
 		Owner: Neutral
-	HandOfNod: hand
-		Location: 15,14
-		Owner: Nod
 	Actor88: nuke
 		Location: 11,12
 		Owner: Nod
 	Actor89: hq
 		Location: 10,14
 		Owner: Nod
-	Hunter1: bggy
-		Location: 27,37
-		Owner: Nod
-	Hunter2: bggy
-		Location: 41,29
-		Owner: Nod
-		Facing: 128
 	Actor92: jeep
 		Location: 49,45
 		Owner: GDI
@@ -369,10 +359,6 @@ Actors:
 		Location: 53,26
 		Owner: Nod
 		Facing: 128
-	tank: ltnk
-		Location: 8,17
-		Owner: Nod
-		Facing: 96
 	Actor99: e3
 		Location: 8,45
 		Owner: Nod
@@ -506,6 +492,20 @@ Actors:
 		Location: 19,25
 		Owner: Nod
 		SubCell: 4
+	tank: ltnk
+		Location: 8,17
+		Owner: Nod
+		Facing: 96
+	HandOfNod: hand
+		Location: 15,14
+		Owner: Nod
+	Hunter1: bggy
+		Location: 27,37
+		Owner: Nod
+	Hunter2: bggy
+		Location: 41,29
+		Owner: Nod
+		Facing: 128
 	Hunter3: e3
 		Location: 37,36
 		Owner: Nod
@@ -518,8 +518,11 @@ Actors:
 		Location: 38,35
 		Owner: Nod
 		SubCell: 4
-	waypoint26: waypoint
-		Location: 42,41
+	crate: CRATE.plain
+		Location: 14,13
+		Owner: Neutral
+	HeliEntry: waypoint
+		Location: 4,26
 		Owner: Neutral
 	GDIHeliLZ: waypoint
 		Location: 8,14
@@ -527,30 +530,24 @@ Actors:
 	NodHeliLZ: waypoint
 		Location: 40,30
 		Owner: Neutral
-	waypoint4: waypoint
-		Location: 18,47
-		Owner: Neutral
-	waypoint3: waypoint
-		Location: 11,42
-		Owner: Neutral
-	waypoint2: waypoint
-		Location: 12,28
-		Owner: Neutral
-	waypoint1: waypoint
+	NodPatrol1: waypoint
 		Location: 13,19
 		Owner: Neutral
-	GDIReinforcementsWP1: waypoint
-		Location: 50,45
+	NodPatrol2: waypoint
+		Location: 12,28
 		Owner: Neutral
-	crate: CRATE.plain
-		Location: 14,13
+	NodPatrol3: waypoint
+		Location: 11,42
 		Owner: Neutral
-	HeliEntry: waypoint
-		Location: 4,26
+	NodPatrol4: waypoint
+		Location: 18,47
 		Owner: Neutral
 	GDIReinforcementsEntry: waypoint
 		Location: 54,45
 		Owner: Neutral
+	GDIReinforcementsWP1: waypoint
+		Location: 50,45
+		Owner: Neutral
 
 Smudges:
 
diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua
index fc9e3a9f73..42dea2d30a 100644
--- a/mods/cnc/maps/gdi04c/gdi04c.lua
+++ b/mods/cnc/maps/gdi04c/gdi04c.lua
@@ -9,8 +9,8 @@ TownAttackWave2 = { "ltnk", "ltnk" }
 TownAttackWave3 = { "e1", "e1", "e1", "e3", "e3", "e3" }
 TownAttackWpts = { waypoint1, waypoint2 }
 
-Civvie1Wpts = { waypoint3, waypoint17 }
-Civvie2Wpts = { waypoint26, waypoint3, waypoint9, waypoint4, waypoint5, waypoint6, waypoint8, waypoint7, waypoint1, waypoint2 }
+Civvie1Wpts = { CivvieWpts1, CivvieWpts2 }
+Civvie2Wpts = { CivvieWpts3, CivvieWpts1, CivvieWpts4, CivvieWpts5, CivvieWpts6, CivvieWpts7, CivvieWpts8, CivvieWpts9, CivvieWpts10, CivvieWpts11 }
 
 FollowCivvieWpts = function(actor, wpts)
 	Utils.Do(wpts, function(wpt)
@@ -36,23 +36,23 @@ TownAttackAction = function(actor)
 end
 
 AttackTown = function()
-	Reinforcements.Reinforce(nod, TownAttackWave1, { NodReinfEntry.Location, waypoint0.Location }, DateTime.Seconds(0.25), TownAttackAction)
+	Reinforcements.Reinforce(nod, TownAttackWave1, { NodReinfEntry.Location, NodReinfRally.Location }, DateTime.Seconds(0.25), TownAttackAction)
 	Trigger.AfterDelay(DateTime.Seconds(2), function()
-		Reinforcements.Reinforce(nod, TownAttackWave2, { NodReinfEntry.Location, waypoint0.Location }, DateTime.Seconds(1), TownAttackAction)
+		Reinforcements.Reinforce(nod, TownAttackWave2, { NodReinfEntry.Location, NodReinfRally.Location }, DateTime.Seconds(1), TownAttackAction)
 	end)
 	Trigger.AfterDelay(DateTime.Seconds(4), function()
-		Reinforcements.Reinforce(nod, TownAttackWave3, { NodReinfEntry.Location, waypoint0.Location }, DateTime.Seconds(1), TownAttackAction)
+		Reinforcements.Reinforce(nod, TownAttackWave3, { NodReinfEntry.Location, NodReinfRally.Location }, DateTime.Seconds(1), TownAttackAction)
 	end)
 end
 
 SendGDIReinforcements = function()
-	Reinforcements.Reinforce(player, GDIReinforcementsPart1, { GDIReinfEntry1.Location, waypoint12.Location }, DateTime.Seconds(1), function(actor)
+	Reinforcements.Reinforce(player, GDIReinforcementsPart1, { GDIReinfEntry1.Location, GDIReinfRally1.Location }, DateTime.Seconds(1), function(actor)
 		Media.PlaySpeechNotification(player, "Reinforce")
-		actor.Move(waypoint10.Location)
+		actor.Move(GDIReinfRally3.Location)
 		actor.Stance = "Defend"
 	end)
 	Trigger.AfterDelay(DateTime.Seconds(5), function()
-		Reinforcements.ReinforceWithTransport(player, "apc", GDIReinforcementsPart2, { GDIReinfEntry2.Location, waypoint13.Location }, nil, function(apc, team)
+		Reinforcements.ReinforceWithTransport(player, "apc", GDIReinforcementsPart2, { GDIReinfEntry2.Location, GDIReinfRally2.Location }, nil, function(apc, team)
 			Media.PlaySpeechNotification(player, "Reinforce")
 			apc.Move(GDIUnloadWpt.Location)
 			apc.UnloadPassengers()
diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml
index dd57a4b35a..918919b764 100644
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -455,33 +455,6 @@ Actors:
 	Actor131: v06
 		Location: 17,52
 		Owner: Civillians
-	TrigLos2Farm1: v04
-		Location: 25,53
-		Owner: Civillians
-	TrigLos2Farm2: v06
-		Location: 24,50
-		Owner: Civillians
-	TrigLos2Farm3: v07
-		Location: 19,46
-		Owner: Civillians
-	TrigLos2Farm4: v01
-		Location: 18,44
-		Owner: Civillians
-	TrigHuntFarm1: v06
-		Location: 45,43
-		Owner: Civillians
-	TrigRNF1Farm1: v07
-		Location: 31,53
-		Owner: Civillians
-	TrigRNF1Farm2: v09
-		Location: 31,50
-		Owner: Civillians
-	TrigRNF2Farm1: v08
-		Location: 30,53
-		Owner: Civillians
-	TrigRNF2Farm2: v11
-		Location: 29,50
-		Owner: Civillians
 	Actor136: bggy
 		Location: 58,35
 		Owner: Nod
@@ -553,14 +526,6 @@ Actors:
 		Owner: Nod
 		Facing: 64
 		SubCell: 0
-	civvie1: c8
-		Location: 26,22
-		Owner: Civillians
-		SubCell: 4
-	civvie2: c3
-		Location: 26,22
-		Owner: Civillians
-		SubCell: 3
 	Actor154: c2
 		Location: 23,56
 		Owner: Civillians
@@ -703,69 +668,101 @@ Actors:
 		Location: 34,21
 		Owner: Nod
 		SubCell: 0
-	waypoint27: waypoint
-		Location: 27,46
-		Owner: Neutral
-	waypoint26: waypoint
-		Location: 22,14
-		Owner: Neutral
-	waypoint17: waypoint
-		Location: 43,19
-		Owner: Neutral
-	waypoint13: waypoint
-		Location: 16,47
-		Owner: Neutral
-	waypoint12: waypoint
-		Location: 16,51
-		Owner: Neutral
-	GDIUnloadWpt: waypoint
-		Location: 28,47
-		Owner: Neutral
-	waypoint10: waypoint
-		Location: 27,49
-		Owner: Neutral
-	waypoint9: waypoint
-		Location: 31,29
-		Owner: Neutral
-	waypoint8: waypoint
-		Location: 53,38
-		Owner: Neutral
-	waypoint7: waypoint
-		Location: 45,44
-		Owner: Neutral
-	waypoint6: waypoint
-		Location: 55,32
-		Owner: Neutral
-	waypoint5: waypoint
-		Location: 43,33
-		Owner: Neutral
-	waypoint4: waypoint
-		Location: 37,36
-		Owner: Neutral
-	waypoint3: waypoint
+	TrigHuntFarm1: v06
+		Location: 45,43
+		Owner: Civillians
+	TrigRNF1Farm1: v07
+		Location: 31,53
+		Owner: Civillians
+	TrigRNF1Farm2: v09
+		Location: 31,50
+		Owner: Civillians
+	TrigRNF2Farm1: v08
+		Location: 30,53
+		Owner: Civillians
+	TrigRNF2Farm2: v11
+		Location: 29,50
+		Owner: Civillians
+	TrigLos2Farm1: v04
+		Location: 25,53
+		Owner: Civillians
+	TrigLos2Farm2: v06
+		Location: 24,50
+		Owner: Civillians
+	TrigLos2Farm3: v07
+		Location: 19,46
+		Owner: Civillians
+	TrigLos2Farm4: v01
+		Location: 18,44
+		Owner: Civillians
+	civvie1: c8
+		Location: 26,22
+		Owner: Civillians
+		SubCell: 4
+	civvie2: c3
+		Location: 26,22
+		Owner: Civillians
+		SubCell: 3
+	CivvieWpts1: waypoint
 		Location: 32,14
 		Owner: Neutral
-	waypoint2: waypoint
-		Location: 27,52
+	CivvieWpts2: waypoint
+		Location: 43,19
 		Owner: Neutral
-	waypoint1: waypoint
+	CivvieWpts3: waypoint
+		Location: 22,14
+		Owner: Neutral
+	CivvieWpts4: waypoint
+		Location: 31,29
+		Owner: Neutral
+	CivvieWpts5: waypoint
+		Location: 37,36
+		Owner: Neutral
+	CivvieWpts6: waypoint
+		Location: 43,33
+		Owner: Neutral
+	CivvieWpts7: waypoint
+		Location: 55,32
+		Owner: Neutral
+	CivvieWpts8: waypoint
+		Location: 53,38
+		Owner: Neutral
+	CivvieWpts9: waypoint
+		Location: 45,44
+		Owner: Neutral
+	CivvieWpts10: waypoint
 		Location: 36,52
 		Owner: Neutral
-	waypoint0: waypoint
+	CivvieWpts11: waypoint
+		Location: 27,52
+		Owner: Neutral
+	NodReinfEntry: waypoint
+		Location: 61,55
+		Owner: Neutral
+	NodReinfRally: waypoint
 		Location: 55,54
 		Owner: Neutral
 	TownAttackWpt: waypoint
 		Location: 24,48
 		Owner: Neutral
-	NodReinfEntry: waypoint
-		Location: 61,55
-		Owner: Neutral
 	GDIReinfEntry1: waypoint
 		Location: 14,51
 		Owner: Neutral
 	GDIReinfEntry2: waypoint
 		Location: 14,47
 		Owner: Neutral
+	GDIReinfRally1: waypoint
+		Location: 16,51
+		Owner: Neutral
+	GDIReinfRally2: waypoint
+		Location: 16,47
+		Owner: Neutral
+	GDIReinfRally3: waypoint
+		Location: 27,49
+		Owner: Neutral
+	GDIUnloadWpt: waypoint
+		Location: 28,47
+		Owner: Neutral
 
 Smudges:
 	sc5 58,38 0:
diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
index bc86f9f1b6..387a6fb8ff 100644
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -189,6 +189,12 @@ Actors:
 	Actor24: rock2
 		Location: 31,61
 		Owner: Neutral
+	Actor27: jeep
+		Location: 31,28
+		Owner: GDI
+	Actor28: jeep
+		Location: 28,29
+		Owner: GDI
 	Vil01: v21
 		Location: 29,23
 		Owner: Villagers
@@ -267,12 +273,6 @@ Actors:
 	VillageRallyPoint: waypoint
 		Location: 24,17
 		Owner: Neutral
-	Actor27: jeep
-		Location: 31,28
-		Owner: GDI
-	Actor28: jeep
-		Location: 28,29
-		Owner: GDI
 
 Smudges:
 
diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml
index 64bae44fbf..604cb1fa1d 100644
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -300,9 +300,6 @@ Actors:
 	Actor76: v21
 		Location: 43,16
 		Owner: Neutral
-	TechCenter: miss
-		Location: 14,17
-		Owner: GDI
 	Actor78: v22
 		Location: 39,16
 		Owner: Neutral
@@ -325,9 +322,6 @@ Actors:
 		Location: 29,34
 		Owner: GDI
 		Facing: 96
-	TibFieldHumvee01: jeep
-		Location: 52,19
-		Owner: GDI
 	Actor95: e1
 		Location: 33,20
 		Owner: GDI
@@ -338,16 +332,6 @@ Actors:
 		Owner: GDI
 		Facing: 128
 		SubCell: 3
-	VillageGuard01: e1
-		Location: 38,22
-		Owner: GDI
-		Facing: 96
-		SubCell: 2
-	VillageGuard02: e1
-		Location: 38,22
-		Owner: GDI
-		Facing: 96
-		SubCell: 3
 	Actor99: e1
 		Location: 14,44
 		Owner: GDI
@@ -388,11 +372,6 @@ Actors:
 		Owner: Neutral
 		Facing: 224
 		SubCell: 0
-	VillageGuard03: e1
-		Location: 39,22
-		Owner: GDI
-		Facing: 160
-		SubCell: 3
 	Actor108: e1
 		Location: 34,31
 		Owner: GDI
@@ -432,24 +411,45 @@ Actors:
 		Owner: GDI
 		Facing: 128
 		SubCell: 0
-	AttackWaveSpawnA: waypoint
-		Location: 45,16
+	TechCenter: miss
+		Location: 14,17
+		Owner: GDI
+	TibFieldHumvee01: jeep
+		Location: 52,19
+		Owner: GDI
+	VillageGuard01: e1
+		Location: 38,22
+		Owner: GDI
+		Facing: 96
+		SubCell: 2
+	VillageGuard02: e1
+		Location: 38,22
+		Owner: GDI
+		Facing: 96
+		SubCell: 3
+	VillageGuard03: e1
+		Location: 39,22
+		Owner: GDI
+		Facing: 160
+		SubCell: 3
+	PlayerBase: waypoint
+		Location: 50,38
 		Owner: Neutral
 	NodEntry: waypoint
 		Location: 54,40
 		Owner: Neutral
-	PlayerBase: waypoint
-		Location: 50,38
-		Owner: Neutral
 	NodRallyPoint: waypoint
 		Location: 45,42
 		Owner: Neutral
-	AttackWaveSpawnC: waypoint
-		Location: 33,16
+	AttackWaveSpawnA: waypoint
+		Location: 45,16
 		Owner: Neutral
 	AttackWaveSpawnB: waypoint
 		Location: 44,48
 		Owner: Neutral
+	AttackWaveSpawnC: waypoint
+		Location: 33,16
+		Owner: Neutral
 	CellTrig: waypoint
 		Location: 32,47
 		Owner: Neutral
diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml
index 1630eece0f..8b9807556d 100644
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -386,9 +386,6 @@ Actors:
 	Actor63: proc
 		Location: 20,17
 		Owner: GDI
-	TechCenter: miss
-		Location: 14,17
-		Owner: GDI
 	Actor65: v19
 		Location: 29,41
 		Owner: Neutral
@@ -398,12 +395,6 @@ Actors:
 	Actor68: v19
 		Location: 29,42
 		Owner: Neutral
-	McvEntry: waypoint
-		Location: 54,38
-		Owner: Neutral
-	McvDeploy: waypoint
-		Location: 52,36
-		Owner: Neutral
 	Actor72: jeep
 		Location: 28,21
 		Owner: GDI
@@ -420,12 +411,6 @@ Actors:
 		Location: 29,21
 		Owner: GDI
 		Facing: 128
-	NodEntry: waypoint
-		Location: 54,40
-		Owner: Neutral
-	NodRallypoint: waypoint
-		Location: 50,42
-		Owner: Neutral
 	Actor77: jeep
 		Location: 47,21
 		Owner: GDI
@@ -455,6 +440,21 @@ Actors:
 		Owner: Neutral
 		Facing: 224
 		SubCell: 4
+	TechCenter: miss
+		Location: 14,17
+		Owner: GDI
+	McvEntry: waypoint
+		Location: 54,38
+		Owner: Neutral
+	McvDeploy: waypoint
+		Location: 52,36
+		Owner: Neutral
+	NodEntry: waypoint
+		Location: 54,40
+		Owner: Neutral
+	NodRallypoint: waypoint
+		Location: 50,42
+		Owner: Neutral
 	PlayerBase: waypoint
 		Location: 50,39
 		Owner: Neutral
diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml
index 01e992d66c..0bd3072e06 100644
--- a/mods/cnc/maps/shellmap/map.yaml
+++ b/mods/cnc/maps/shellmap/map.yaml
@@ -77,18 +77,6 @@ Players:
 		Enemies: Nod, GDI, Multi0, Multi1, Multi2, Multi3, Multi4, Multi5
 
 Actors:
-	boat1: boat
-		Location: 45,33
-		Owner: GDI
-	boat2: boat
-		Location: 39,37
-		Owner: GDI
-	boat3: boat
-		Location: 70,33
-		Owner: GDI
-	boat4: boat
-		Location: 79,37
-		Owner: GDI
 	Actor4: fix
 		Location: 59,44
 		Owner: GDI
@@ -962,6 +950,18 @@ Actors:
 	Actor221: jeep
 		Location: 57,45
 		Owner: GDI
+	boat1: boat
+		Location: 45,33
+		Owner: GDI
+	boat2: boat
+		Location: 39,37
+		Owner: GDI
+	boat3: boat
+		Location: 70,33
+		Owner: GDI
+	boat4: boat
+		Location: 79,37
+		Owner: GDI
 	lst1: lst
 		Location: 53,35
 		Owner: GDI
diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml
index 8cf950a6f2..ee477b82b2 100644
--- a/mods/ra/maps/allies-01/map.yaml
+++ b/mods/ra/maps/allies-01/map.yaml
@@ -145,9 +145,6 @@ Actors:
 	Actor25: powr
 		Location: 61,57
 		Owner: USSR
-	Lab: stek
-		Location: 61,60
-		Owner: USSR
 	Actor27: fact
 		Location: 69,62
 		Owner: USSR
@@ -189,9 +186,6 @@ Actors:
 	Actor39: powr
 		Location: 77,67
 		Owner: USSR
-	OilPump: v19
-		Location: 59,57
-		Owner: USSR
 	Actor41: brl3
 		Location: 60,57
 		Owner: USSR
@@ -214,10 +208,6 @@ Actors:
 		Location: 63,50
 		Owner: Greece
 		Facing: 128
-	Harvester: harv
-		Location: 72,60
-		Owner: USSR
-		Facing: 224
 	Actor49: jeep
 		Location: 62,50
 		Owner: Greece
@@ -226,24 +216,6 @@ Actors:
 		Location: 64,50
 		Owner: Greece
 		Facing: 128
-	Patrol1: dog
-		Location: 63,59
-		Owner: USSR
-		SubCell: 2
-	Patrol2: e1
-		Location: 64,58
-		Owner: USSR
-		SubCell: 3
-	LabGuard3: e1
-		Location: 61,63
-		Owner: USSR
-		Facing: 128
-		SubCell: 0
-	LabGuard2: e1
-		Location: 63,63
-		Owner: USSR
-		Facing: 96
-		SubCell: 0
 	Actor55: e2
 		Location: 73,66
 		Owner: USSR
@@ -268,18 +240,6 @@ Actors:
 		Owner: USSR
 		Facing: 96
 		SubCell: 1
-	Patrol4: e1
-		Location: 62,55
-		Owner: USSR
-		SubCell: 4
-	Patrol3: e1
-		Location: 64,59
-		Owner: USSR
-		SubCell: 2
-	LabGuard1: e1
-		Location: 64,61
-		Owner: USSR
-		SubCell: 4
 	Actor63: e1
 		Location: 58,60
 		Owner: USSR
@@ -300,14 +260,6 @@ Actors:
 		Owner: Greece
 		Facing: 160
 		SubCell: 2
-	Civilian1: c8
-		Location: 74,50
-		Owner: England
-		SubCell: 0
-	Civilian2: c7
-		Location: 76,48
-		Owner: England
-		SubCell: 3
 	Actor69: e2
 		Location: 62,56
 		Owner: USSR
@@ -327,69 +279,6 @@ Actors:
 		Owner: Greece
 		Facing: 128
 		SubCell: 1
-	ExtractionLZ: waypoint
-		Location: 53,49
-		Owner: Neutral
-	waypoint1: waypoint
-		Location: 57,74
-		Owner: Neutral
-	waypoint2: waypoint
-		Location: 53,79
-		Owner: Neutral
-	waypoint3: waypoint
-		Location: 57,65
-		Owner: Neutral
-	CruiserCameraPoint: waypoint
-		Location: 69,67
-		Owner: Neutral
-	waypoint7: waypoint
-		Location: 69,56
-		Owner: Neutral
-	waypoint6: waypoint
-		Location: 55,60
-		Owner: Neutral
-	EinsteinSpawnPoint: waypoint
-		Location: 62,61
-		Owner: Neutral
-	waypoint8: waypoint
-		Location: 49,55
-		Owner: Neutral
-	waypoint9: waypoint
-		Location: 55,56
-		Owner: Neutral
-	InsertionLZ: waypoint
-		Location: 63,47
-		Owner: Neutral
-	InsertionEntry: waypoint
-		Location: 63,45
-		Owner: Neutral
-	BaseCameraPoint: waypoint
-		Location: 64,63
-		Owner: Neutral
-	CruiserPoint4: waypoint
-		Location: 72,75
-		Owner: Neutral
-	SouthReinforcementsPoint: waypoint
-		Location: 66,80
-		Owner: Neutral
-	ExtractionFlarePoint: waypoint
-		Location: 54,48
-		Owner: Neutral
-	CruiserPoint2: waypoint
-		Location: 64,75
-		Owner: Neutral
-	CruiserPoint3: waypoint
-		Location: 68,76
-		Owner: Neutral
-	CruiserPoint1: waypoint
-		Location: 60,74
-		Owner: Neutral
-	waypoint78: waypoint
-		Location: 70,60
-		Owner: Neutral
-	waypoint98: waypoint
-		Location: 63,47
-		Owner: Neutral
 	Actor48: fenc
 		Location: 53,60
 		Owner: USSR
@@ -486,9 +375,93 @@ Actors:
 	Actor97: fenc
 		Location: 68,54
 		Owner: USSR
+	Lab: stek
+		Location: 61,60
+		Owner: USSR
+	OilPump: v19
+		Location: 59,57
+		Owner: USSR
+	Harvester: harv
+		Location: 72,60
+		Owner: USSR
+		Facing: 224
+	LabGuard1: e1
+		Location: 64,61
+		Owner: USSR
+		SubCell: 4
+	LabGuard2: e1
+		Location: 63,63
+		Owner: USSR
+		Facing: 96
+		SubCell: 0
+	LabGuard3: e1
+		Location: 61,63
+		Owner: USSR
+		Facing: 128
+		SubCell: 0
+	Patrol1: dog
+		Location: 63,59
+		Owner: USSR
+		SubCell: 2
+	Patrol2: e1
+		Location: 64,58
+		Owner: USSR
+		SubCell: 3
+	Patrol3: e1
+		Location: 64,59
+		Owner: USSR
+		SubCell: 2
+	Patrol4: e1
+		Location: 62,55
+		Owner: USSR
+		SubCell: 4
+	Civilian1: c8
+		Location: 74,50
+		Owner: England
+		SubCell: 0
+	Civilian2: c7
+		Location: 76,48
+		Owner: England
+		SubCell: 3
+	EinsteinSpawnPoint: waypoint
+		Location: 62,61
+		Owner: Neutral
+	InsertionEntry: waypoint
+		Location: 63,45
+		Owner: Neutral
+	InsertionLZ: waypoint
+		Location: 63,47
+		Owner: Neutral
+	BaseCameraPoint: waypoint
+		Location: 64,63
+		Owner: Neutral
+	SouthReinforcementsPoint: waypoint
+		Location: 66,80
+		Owner: Neutral
+	ExtractionLZ: waypoint
+		Location: 53,49
+		Owner: Neutral
+	ExtractionFlarePoint: waypoint
+		Location: 54,48
+		Owner: Neutral
 	ExtractionExitPoint: waypoint
 		Location: 78,49
 		Owner: Neutral
+	CruiserCameraPoint: waypoint
+		Location: 69,67
+		Owner: Neutral
+	CruiserPoint1: waypoint
+		Location: 60,74
+		Owner: Neutral
+	CruiserPoint2: waypoint
+		Location: 64,75
+		Owner: Neutral
+	CruiserPoint4: waypoint
+		Location: 72,75
+		Owner: Neutral
+	CruiserPoint3: waypoint
+		Location: 68,76
+		Owner: Neutral
 
 Smudges:
 
diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml
index b281bdf738..fb9dcdc61a 100644
--- a/mods/ra/maps/allies-02/map.yaml
+++ b/mods/ra/maps/allies-02/map.yaml
@@ -245,9 +245,6 @@ Actors:
 	Actor56: tc03
 		Location: 43,70
 		Owner: Neutral
-	SovietWarfactory: weap
-		Location: 60,66
-		Owner: USSR
 	Actor58: fact
 		Location: 62,61
 		Owner: USSR
@@ -362,11 +359,6 @@ Actors:
 	Actor94: barl
 		Location: 58,58
 		Owner: USSR
-	Harvester: harv
-		Location: 55,65
-		Owner: USSR
-		Health: 0.5
-		Facing: 160
 	Actor96: dog
 		Location: 53,58
 		Owner: USSR
@@ -580,72 +572,6 @@ Actors:
 		Owner: Greece
 		Facing: 160
 		SubCell: 1
-	TruckEntryPoint: waypoint
-		Location: 49,44
-		Owner: Neutral
-	waypoint1: waypoint
-		Location: 49,50
-		Owner: Neutral
-	TruckRallyPoint: waypoint
-		Location: 49,76
-		Owner: Neutral
-	waypoint3: waypoint
-		Location: 65,82
-		Owner: Neutral
-	waypoint4: waypoint
-		Location: 74,82
-		Owner: Neutral
-	waypoint6: waypoint
-		Location: 65,82
-		Owner: Neutral
-	waypoint7: waypoint
-		Location: 74,82
-		Owner: Neutral
-	waypoint8: waypoint
-		Location: 78,74
-		Owner: Neutral
-	waypoint9: waypoint
-		Location: 82,65
-		Owner: Neutral
-	ReinforcementsRallyPoint: waypoint
-		Location: 88,49
-		Owner: Neutral
-	waypoint11: waypoint
-		Location: 51,65
-		Owner: Neutral
-	waypoint12: waypoint
-		Location: 63,64
-		Owner: Neutral
-	waypoint13: waypoint
-		Location: 72,61
-		Owner: Neutral
-	waypoint14: waypoint
-		Location: 69,47
-		Owner: Neutral
-	waypoint15: waypoint
-		Location: 78,51
-		Owner: Neutral
-	waypoint16: waypoint
-		Location: 80,45
-		Owner: Neutral
-	waypoint25: waypoint
-		Location: 80,89
-		Owner: Neutral
-	waypoint26: waypoint
-		Location: 43,63
-		Owner: Neutral
-	waypoint94: waypoint
-		Location: 90,46
-		Owner: Neutral
-	DeployPoint: waypoint
-		Location: 89,51
-		Owner: Neutral
-	waypoint96: waypoint
-		Location: 90,68
-		Owner: Neutral
-	waypoint98: waypoint
-		Location: 88,49
-		Owner: Neutral
 	Actor139: fenc
 		Location: 57,75
 		Owner: USSR
@@ -742,12 +668,32 @@ Actors:
 	Actor170: fenc
 		Location: 50,51
 		Owner: USSR
-	ReinforcementsEntryPoint: waypoint
-		Location: 90,44
+	SovietWarfactory: weap
+		Location: 60,66
+		Owner: USSR
+	Harvester: harv
+		Location: 55,65
+		Owner: USSR
+		Health: 0.5
+		Facing: 160
+	TruckEntryPoint: waypoint
+		Location: 49,44
+		Owner: Neutral
+	TruckRallyPoint: waypoint
+		Location: 49,76
 		Owner: Neutral
 	TruckExitPoint: waypoint
 		Location: 80,85
 		Owner: Neutral
+	ReinforcementsEntryPoint: waypoint
+		Location: 90,44
+		Owner: Neutral
+	ReinforcementsRallyPoint: waypoint
+		Location: 88,49
+		Owner: Neutral
+	DeployPoint: waypoint
+		Location: 89,51
+		Owner: Neutral
 
 Smudges:
 	cr1 60,79 0:
diff --git a/mods/ra/maps/allies-03a/allies03a.lua b/mods/ra/maps/allies-03a/allies03a.lua
index 971e3072d0..0d21906e41 100644
--- a/mods/ra/maps/allies-03a/allies03a.lua
+++ b/mods/ra/maps/allies-03a/allies03a.lua
@@ -112,12 +112,12 @@ InitObjectives = function()
 	end)
 
 	Trigger.OnPlayerLost(player, function()
-		Trigger.AfterDelay(25, function()
+		Trigger.AfterDelay(DateTime.Seconds(1), function()
 			Media.PlaySpeechNotification(player, "MissionFailed")
 		end)
 	end)
 	Trigger.OnPlayerWon(player, function()
-		Trigger.AfterDelay(25, function()
+		Trigger.AfterDelay(DateTime.Seconds(1), function()
 			Media.PlaySpeechNotification(player, "MissionAccomplished")
 		end)
 	end)
diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml
index bfb26f91af..1320705d45 100644
--- a/mods/ra/maps/allies-03a/map.yaml
+++ b/mods/ra/maps/allies-03a/map.yaml
@@ -533,18 +533,6 @@ Actors:
 	Actor157: barl
 		Location: 56,59
 		Owner: USSR
-	USSRBarracks1: barr
-		Location: 51,67
-		Owner: USSR
-	USSRConstructionYard1: fact
-		Location: 55,71
-		Owner: USSR
-	USSRPowerPlant1: powr
-		Location: 53,72
-		Owner: USSR
-	USSRPowerPlant2: powr
-		Location: 51,72
-		Owner: USSR
 	Actor162: brl3
 		Location: 55,67
 		Owner: USSR
@@ -572,30 +560,6 @@ Actors:
 	Actor170: v19
 		Location: 54,68
 		Owner: Neutral
-	USSRWarFactory: weap
-		Location: 83,73
-		Owner: USSR
-	USSRBarracks2: barr
-		Location: 78,75
-		Owner: USSR
-	USSRKennel: kenn
-		Location: 81,77
-		Owner: USSR
-	USSRAdvancedPowerPlant: apwr
-		Location: 81,80
-		Owner: USSR
-	USSRRadarDome: dome
-		Location: 78,80
-		Owner: USSR
-	USSRConstructionYard2: fact
-		Location: 88,80
-		Owner: USSR
-	USSRPowerPlant3: powr
-		Location: 90,77
-		Owner: USSR
-	USSRPowerPlant4: powr
-		Location: 92,76
-		Owner: USSR
 	Actor179: brl3
 		Location: 77,66
 		Owner: USSR
@@ -611,9 +575,6 @@ Actors:
 	Actor183: barl
 		Location: 78,69
 		Owner: USSR
-	USSRFlameTower1: ftur
-		Location: 50,69
-		Owner: USSR
 	Actor185: brl3
 		Location: 57,70
 		Owner: USSR
@@ -629,9 +590,6 @@ Actors:
 	Actor189: barl
 		Location: 59,69
 		Owner: USSR
-	USSRTechCenter: miss
-		Location: 58,71
-		Owner: USSR
 	Actor191: brl3
 		Location: 56,67
 		Owner: USSR
@@ -641,12 +599,6 @@ Actors:
 	Actor192: barl
 		Location: 56,68
 		Owner: USSR
-	USSRForwardCommand: fcom
-		Location: 79,69
-		Owner: USSR
-	ExplosiveBarrel: brl3
-		Location: 102,49
-		Owner: USSR
 	Actor194: brl3
 		Location: 102,49
 		Owner: USSR
@@ -746,9 +698,6 @@ Actors:
 	Actor224: brl3
 		Location: 100,70
 		Owner: USSR
-	USSRFlameTower2: ftur
-		Location: 100,69
-		Owner: USSR
 	Actor226: brl3
 		Location: 88,64
 		Owner: USSR
@@ -861,11 +810,6 @@ Actors:
 		Owner: USSR
 		Facing: 224
 		SubCell: 1
-	PGuard1: e1
-		Location: 58,59
-		Owner: USSR
-		Facing: 224
-		SubCell: 3
 	Actor259: e1.autotarget
 		Location: 54,55
 		Owner: USSR
@@ -896,30 +840,6 @@ Actors:
 		Owner: USSR
 		Facing: 192
 		SubCell: 1
-	USSRBaseGuard5: e1
-		Location: 51,69
-		Owner: USSR
-		Facing: 160
-		SubCell: 3
-	USSRBaseGuard6: e2
-		Location: 49,72
-		Owner: USSR
-		Facing: 128
-		SubCell: 2
-	USSRBaseGuard3: e2
-		Location: 48,70
-		Owner: USSR
-		SubCell: 4
-	USSRBaseGuard4: e2
-		Location: 49,69
-		Owner: USSR
-		Facing: 160
-		SubCell: 0
-	USSRBaseGuard7: e1
-		Location: 53,70
-		Owner: USSR
-		Facing: 160
-		SubCell: 1
 	Actor270: e1.autotarget
 		Location: 65,71
 		Owner: USSR
@@ -935,45 +855,11 @@ Actors:
 		Owner: USSR
 		Facing: 128
 		SubCell: 4
-	USSRBaseGuard1: e1
-		Location: 49,66
-		Owner: USSR
-		Facing: 96
-		SubCell: 0
-	USSRBaseGuard2: e1
-		Location: 48,67
-		Owner: USSR
-		Facing: 224
-		SubCell: 0
-	USSRBaseGuard11: e1
-		Location: 78,77
-		Owner: USSR
-		Facing: 128
-		SubCell: 4
-	USSRBaseGuard12: e1
-		Location: 79,77
-		Owner: USSR
-		Facing: 96
-		SubCell: 4
 	Actor277: e1
 		Location: 78,77
 		Owner: USSR
 		Facing: 160
 		SubCell: 3
-	USSRBaseGuard10: e2
-		Location: 77,80
-		Owner: USSR
-		Facing: 64
-		SubCell: 0
-	USSRBaseGuard13: e2
-		Location: 80,76
-		Owner: USSR
-		SubCell: 0
-	USSRBaseGuard14: dog
-		Location: 81,76
-		Owner: USSR
-		Facing: 160
-		SubCell: 3
 	Actor281: dog
 		Location: 85,81
 		Owner: USSR
@@ -984,26 +870,6 @@ Actors:
 		Owner: USSR
 		Facing: 160
 		SubCell: 1
-	PrisonedMedi2: medi
-		Location: 57,67
-		Owner: Greece
-		Facing: 128
-		SubCell: 0
-	PGuard2: e1
-		Location: 57,68
-		Owner: USSR
-		Facing: 128
-		SubCell: 4
-	USSRBaseGuard8: e1
-		Location: 56,69
-		Owner: USSR
-		Facing: 96
-		SubCell: 2
-	PrisonedEngi: hacke6
-		Location: 57,67
-		Owner: Greece
-		Facing: 96
-		SubCell: 2
 	Actor287: e1.autotarget
 		Location: 84,53
 		Owner: USSR
@@ -1081,10 +947,6 @@ Actors:
 		Owner: USSR
 		Facing: 160
 		SubCell: 2
-	PrisonedMedi1: medi
-		Location: 58,60
-		Owner: Greece
-		SubCell: 0
 	Actor309: fenc
 		Location: 72,63
 		Owner: USSR
@@ -1100,39 +962,6 @@ Actors:
 	Actor306: fenc
 		Location: 71,63
 		Owner: USSR
-	waypoint10: waypoint
-		Location: 50,70
-		Owner: Neutral
-	waypoint20: waypoint
-		Location: 83,54
-		Owner: Neutral
-	waypoint23: waypoint
-		Location: 88,75
-		Owner: Neutral
-	waypoint25: waypoint
-		Location: 59,81
-		Owner: Neutral
-	waypoint26: waypoint
-		Location: 84,74
-		Owner: Neutral
-	waypoint27: waypoint
-		Location: 97,64
-		Owner: Neutral
-	waypoint28: waypoint
-		Location: 60,69
-		Owner: Neutral
-	waypoint29: waypoint
-		Location: 76,66
-		Owner: Neutral
-	waypoint30: waypoint
-		Location: 69,66
-		Owner: Neutral
-	waypoint98: waypoint
-		Location: 61,52
-		Owner: Neutral
-	waypoint99: waypoint
-		Location: 67,64
-		Owner: Neutral
 	Actor312: fenc
 		Location: 71,62
 		Owner: USSR
@@ -1307,6 +1136,150 @@ Actors:
 	Actor369: fenc
 		Location: 100,57
 		Owner: USSR
+	USSRBarracks1: barr
+		Location: 51,67
+		Owner: USSR
+	USSRBarracks2: barr
+		Location: 78,75
+		Owner: USSR
+	USSRWarFactory: weap
+		Location: 83,73
+		Owner: USSR
+	USSRKennel: kenn
+		Location: 81,77
+		Owner: USSR
+	USSRAdvancedPowerPlant: apwr
+		Location: 81,80
+		Owner: USSR
+	USSRRadarDome: dome
+		Location: 78,80
+		Owner: USSR
+	USSRConstructionYard1: fact
+		Location: 55,71
+		Owner: USSR
+	USSRConstructionYard2: fact
+		Location: 88,80
+		Owner: USSR
+	USSRPowerPlant1: powr
+		Location: 53,72
+		Owner: USSR
+	USSRPowerPlant2: powr
+		Location: 51,72
+		Owner: USSR
+	USSRPowerPlant3: powr
+		Location: 90,77
+		Owner: USSR
+	USSRPowerPlant4: powr
+		Location: 92,76
+		Owner: USSR
+	USSRFlameTower1: ftur
+		Location: 50,69
+		Owner: USSR
+	USSRFlameTower2: ftur
+		Location: 100,69
+		Owner: USSR
+	USSRTechCenter: miss
+		Location: 58,71
+		Owner: USSR
+	USSRForwardCommand: fcom
+		Location: 79,69
+		Owner: USSR
+	USSRBaseGuard1: e1
+		Location: 49,66
+		Owner: USSR
+		Facing: 96
+		SubCell: 0
+	USSRBaseGuard2: e1
+		Location: 48,67
+		Owner: USSR
+		Facing: 224
+		SubCell: 0
+	USSRBaseGuard3: e2
+		Location: 48,70
+		Owner: USSR
+		SubCell: 4
+	USSRBaseGuard4: e2
+		Location: 49,69
+		Owner: USSR
+		Facing: 160
+		SubCell: 0
+	USSRBaseGuard5: e1
+		Location: 51,69
+		Owner: USSR
+		Facing: 160
+		SubCell: 3
+	USSRBaseGuard6: e2
+		Location: 49,72
+		Owner: USSR
+		Facing: 128
+		SubCell: 2
+	USSRBaseGuard7: e1
+		Location: 53,70
+		Owner: USSR
+		Facing: 160
+		SubCell: 1
+	USSRBaseGuard8: e1
+		Location: 56,69
+		Owner: USSR
+		Facing: 96
+		SubCell: 2
+	USSRBaseGuard10: e2
+		Location: 77,80
+		Owner: USSR
+		Facing: 64
+		SubCell: 0
+	USSRBaseGuard11: e1
+		Location: 78,77
+		Owner: USSR
+		Facing: 128
+		SubCell: 4
+	USSRBaseGuard12: e1
+		Location: 79,77
+		Owner: USSR
+		Facing: 96
+		SubCell: 4
+	USSRBaseGuard13: e2
+		Location: 80,76
+		Owner: USSR
+		SubCell: 0
+	USSRBaseGuard14: dog
+		Location: 81,76
+		Owner: USSR
+		Facing: 160
+		SubCell: 3
+	PGuard1: e1
+		Location: 58,59
+		Owner: USSR
+		Facing: 224
+		SubCell: 3
+	PGuard2: e1
+		Location: 57,68
+		Owner: USSR
+		Facing: 128
+		SubCell: 4
+	PrisonedMedi1: medi
+		Location: 58,60
+		Owner: Greece
+		SubCell: 0
+	PrisonedMedi2: medi
+		Location: 57,67
+		Owner: Greece
+		Facing: 128
+		SubCell: 0
+	PrisonedEngi: hacke6
+		Location: 57,67
+		Owner: Greece
+		Facing: 96
+		SubCell: 2
+	Jail1: prison
+		Location: 58,60
+		Owner: Greece
+	Jail2: prison
+		Location: 57,67
+		Owner: Greece
+	ExplosiveBarrel: brl3
+		Location: 102,49
+		Owner: USSR
 	AlliedUnitsEntry: waypoint
 		Location: 60,48
 		Owner: Neutral
@@ -1355,12 +1328,6 @@ Actors:
 	USSRMoneyCrateSpawn: waypoint
 		Location: 59,72
 		Owner: Neutral
-	Jail1: prison
-		Location: 58,60
-		Owner: Greece
-	Jail2: prison
-		Location: 57,67
-		Owner: Greece
 
 Smudges:
 
diff --git a/mods/ra/maps/desert-shellmap/map.yaml b/mods/ra/maps/desert-shellmap/map.yaml
index 50f809b0b3..f5f376f650 100644
--- a/mods/ra/maps/desert-shellmap/map.yaml
+++ b/mods/ra/maps/desert-shellmap/map.yaml
@@ -166,9 +166,6 @@ Actors:
 	Actor50: apwr
 		Location: 51,14
 		Owner: Soviets
-	Entry1: waypoint
-		Location: 1,50
-		Owner: Neutral
 	Actor63: tsla
 		Location: 48,31
 		Owner: Soviets
@@ -199,9 +196,6 @@ Actors:
 	Actor70: afld
 		Location: 47,24
 		Owner: Soviets
-	SovietBarracks3: barr
-		Location: 41,27
-		Owner: Soviets
 	Actor81: rock7
 		Location: 53,19
 		Owner: Neutral
@@ -333,18 +327,9 @@ Actors:
 	Actor115: tsla
 		Location: 40,24
 		Owner: Soviets
-	IronCurtain: iron
-		Location: 110,40
-		Owner: Soviets
 	Actor117: fix
 		Location: 106,34
 		Owner: Soviets
-	SovietWarFactory1: weap
-		Location: 106,29
-		Owner: Soviets
-	SovietBarracks2: barr
-		Location: 102,30
-		Owner: Soviets
 	Actor136: v2rl
 		Location: 91,40
 		Owner: Soviets
@@ -436,9 +421,6 @@ Actors:
 	Actor39: pbox
 		Location: 70,89
 		Owner: Allies
-	AlliedTechnologyCenter: miss
-		Location: 56,68
-		Owner: Neutral
 	Actor152: 1tnk
 		Location: 69,85
 		Owner: Allies
@@ -468,9 +450,6 @@ Actors:
 	Actor105: brik
 		Location: 94,70
 		Owner: Allies
-	SovietBarracks1: barr
-		Location: 109,48
-		Owner: Soviets
 	Actor170: kenn
 		Location: 104,41
 		Owner: Soviets
@@ -480,15 +459,9 @@ Actors:
 	Actor182: rock6
 		Location: 96,45
 		Owner: Neutral
-	Chronosphere: pdox
-		Location: 78,91
-		Owner: Allies
 	Actor298: brik
 		Location: 48,78
 		Owner: Allies
-	AlliedWarFactory1: weap
-		Location: 75,81
-		Owner: Allies
 	Actor156: pbox
 		Location: 52,71
 		Owner: Allies
@@ -699,9 +672,6 @@ Actors:
 	Actor250: sbag
 		Location: 44,67
 		Owner: Allies
-	AlliedBarracks2: tent
-		Location: 50,66
-		Owner: Allies
 	Actor66: gap
 		Location: 62,70
 		Owner: Allies
@@ -729,9 +699,6 @@ Actors:
 	Actor269: v26
 		Location: 21,54
 		Owner: Neutral
-	Entry2: waypoint
-		Location: 1,27
-		Owner: Neutral
 	Actor270: v28
 		Location: 18,49
 		Owner: Neutral
@@ -765,9 +732,6 @@ Actors:
 	Actor280: c10
 		Location: 23,55
 		Owner: Neutral
-	AlliedBarracks1: tent
-		Location: 83,75
-		Owner: Allies
 	Actor282: e1
 		Location: 42,62
 		Owner: Allies
@@ -934,9 +898,6 @@ Actors:
 	Actor329: mine
 		Location: 90,21
 		Owner: Neutral
-	HeliPad1: hpad
-		Location: 70,76
-		Owner: Allies
 	Actor341: dome
 		Location: 63,73
 		Owner: Allies
@@ -991,9 +952,6 @@ Actors:
 	Actor361: pbox
 		Location: 71,96
 		Owner: Allies
-	HeliPad2: hpad
-		Location: 64,78
-		Owner: Allies
 	Actor221: fenc
 		Location: 92,97
 		Owner: Allies
@@ -1015,12 +973,6 @@ Actors:
 	Actor310: fenc
 		Location: 98,96
 		Owner: Allies
-	Entry7: waypoint
-		Location: 1,79
-		Owner: Neutral
-	AttackDest: waypoint
-		Location: 55,69
-		Owner: Neutral
 	Actor6: brik
 		Location: 73,67
 		Owner: Allies
@@ -1174,6 +1126,70 @@ Actors:
 	Actor194: powr
 		Location: 52,74
 		Owner: Allies
+	Actor171: wood
+		Location: 17,53
+		Owner: Neutral
+	Actor172: wood
+		Location: 17,54
+		Owner: Neutral
+	Actor173: wood
+		Location: 17,55
+		Owner: Neutral
+	Actor177: wood
+		Location: 17,56
+		Owner: Neutral
+	Actor184: pbox
+		Location: 96,79
+		Owner: Allies
+	Actor79: agun
+		Location: 70,65
+		Owner: Allies
+	Actor118: agun
+		Location: 47,69
+		Owner: Allies
+		Facing: 64
+	SovietWarFactory1: weap
+		Location: 106,29
+		Owner: Soviets
+	SovietBarracks1: barr
+		Location: 109,48
+		Owner: Soviets
+	SovietBarracks2: barr
+		Location: 102,30
+		Owner: Soviets
+	SovietBarracks3: barr
+		Location: 41,27
+		Owner: Soviets
+	IronCurtain: iron
+		Location: 110,40
+		Owner: Soviets
+	AlliedTechnologyCenter: miss
+		Location: 56,68
+		Owner: Neutral
+	Chronosphere: pdox
+		Location: 78,91
+		Owner: Allies
+	AlliedWarFactory1: weap
+		Location: 75,81
+		Owner: Allies
+	AlliedBarracks1: tent
+		Location: 83,75
+		Owner: Allies
+	AlliedBarracks2: tent
+		Location: 50,66
+		Owner: Allies
+	HeliPad1: hpad
+		Location: 70,76
+		Owner: Allies
+	HeliPad2: hpad
+		Location: 64,78
+		Owner: Allies
+	Entry1: waypoint
+		Location: 1,50
+		Owner: Neutral
+	Entry2: waypoint
+		Location: 1,27
+		Owner: Neutral
 	Entry3: waypoint
 		Location: 10,1
 		Owner: Neutral
@@ -1186,17 +1202,11 @@ Actors:
 	Entry6: waypoint
 		Location: 46,1
 		Owner: Neutral
-	Actor171: wood
-		Location: 17,53
+	Entry7: waypoint
+		Location: 1,79
 		Owner: Neutral
-	Actor172: wood
-		Location: 17,54
-		Owner: Neutral
-	Actor173: wood
-		Location: 17,55
-		Owner: Neutral
-	Actor177: wood
-		Location: 17,56
+	AttackDest: waypoint
+		Location: 55,69
 		Owner: Neutral
 	LstEntry: waypoint
 		Location: 33,126
@@ -1210,9 +1220,6 @@ Actors:
 	Chinook2Entry: waypoint
 		Location: 47,126
 		Owner: Neutral
-	Actor184: pbox
-		Location: 96,79
-		Owner: Allies
 	Paradrop1: waypoint
 		Location: 70,50
 		Owner: Neutral
@@ -1240,13 +1247,6 @@ Actors:
 	ChronoshiftLocation: waypoint
 		Location: 80,65
 		Owner: Neutral
-	Actor79: agun
-		Location: 70,65
-		Owner: Allies
-	Actor118: agun
-		Location: 47,69
-		Owner: Allies
-		Facing: 64
 
 Smudges:
 
@@ -1262,23 +1262,6 @@ Rules:
 		LuaScript:
 			Scripts: desert-shellmap.lua
 		-StartGameNotification:
-	OILB:
-		CashTrickler:
-			ShowTicks: false
-	TRAN.Husk2:
-		Burns:
-			Damage: 0
-	MISS:
-		Invulnerable:
-	APC:
-		Cargo:
-			InitialUnits: e1, e1, e2, e3, e4
-	Ant:
-		Buildable:
-			Owner: soviet
-			Prerequisites: barr
-		Health:
-			HP: 200
 	^Vehicle:
 		GivesBounty:
 			Percentage: 0
@@ -1329,6 +1312,23 @@ Rules:
 		InvulnerabilityUpgrade@UNKILLABLE:
 			UpgradeTypes: unkillable
 			UpgradeMinEnabledLevel: 1
+	OILB:
+		CashTrickler:
+			ShowTicks: false
+	TRAN.Husk2:
+		Burns:
+			Damage: 0
+	MISS:
+		Invulnerable:
+	APC:
+		Cargo:
+			InitialUnits: e1, e1, e2, e3, e4
+	Ant:
+		Buildable:
+			Owner: soviet
+			Prerequisites: barr
+		Health:
+			HP: 200
 	E7:
 		-Selectable:
 
diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml
index f5bf84a294..f91ad6101f 100644
--- a/mods/ra/maps/intervention/map.yaml
+++ b/mods/ra/maps/intervention/map.yaml
@@ -63,9 +63,6 @@ Players:
 		Enemies: Civilians, Allies
 
 Actors:
-	EasyMine: mine
-		Location: 122,112
-		Owner: Neutral
 	Actor1: mine
 		Location: 66,103
 		Owner: Neutral
@@ -105,9 +102,6 @@ Actors:
 	Actor13: tc01
 		Location: 91,142
 		Owner: Neutral
-	SubPen: spen
-		Location: 26,84
-		Owner: Soviets
 	Actor15: gun
 		Location: 18,116
 		Owner: Soviets
@@ -178,33 +172,6 @@ Actors:
 	Actor203: t13
 		Location: 134,82
 		Owner: Neutral
-	Uboat1: ss
-		Location: 17,92
-		Owner: Soviets
-		Facing: 128
-	Uboat2: ss
-		Location: 20,91
-		Owner: Soviets
-		Facing: 128
-	Uboat3: ss
-		Location: 17,112
-		Owner: Soviets
-		Facing: 192
-	Uboat4: ss
-		Location: 34,120
-		Owner: Soviets
-		Facing: 160
-	Uboat5: ss
-		Location: 24,126
-		Owner: Soviets
-		Facing: 160
-	Uboat6: ss
-		Location: 29,131
-		Owner: Soviets
-		Facing: 192
-	Church: v01
-		Location: 21,23
-		Owner: Civilians
 	Actor43: sam
 		Location: 54,103
 		Owner: Soviets
@@ -332,42 +299,12 @@ Actors:
 	Actor209: tc05
 		Location: 141,47
 		Owner: Neutral
-	FarmHouse2: v10
-		Location: 26,30
-		Owner: Civilians
-	FarmHouse1: asianhut
-		Location: 26,23
-		Owner: Civilians
-	HarvGuard3: ftrk
-		Location: 46,95
-		Owner: Soviets
-	FarmHouse3: v06
-		Location: 21,19
-		Owner: Civilians
-	FarmHouse4: v09
-		Location: 19,29
-		Owner: Civilians
-	FarmHouse5: v03
-		Location: 17,21
-		Owner: Civilians
-	FarmHouse6: v02
-		Location: 24,19
-		Owner: Civilians
-	FarmHouse7: v04
-		Location: 17,24
-		Owner: Civilians
 	Actor117: t15
 		Location: 32,17
 		Owner: Neutral
-	FarmHouse8: v07
-		Location: 29,21
-		Owner: Civilians
 	Actor110: v15
 		Location: 31,18
 		Owner: Neutral
-	FarmHouse9: v05
-		Location: 23,28
-		Owner: Civilians
 	Actor101: wood
 		Location: 30,20
 		Owner: Neutral
@@ -780,9 +717,6 @@ Actors:
 	Actor230: t08
 		Location: 101,24
 		Owner: Neutral
-	UboatPatrolWpt1: waypoint
-		Location: 52,129
-		Owner: Soviets
 	Actor232: t07
 		Location: 101,17
 		Owner: Neutral
@@ -1127,12 +1061,6 @@ Actors:
 	Actor345: fix
 		Location: 70,68
 		Owner: Soviets
-	WarFactory: weap
-		Location: 70,72
-		Owner: Soviets
-	Barracks: barr
-		Location: 67,63
-		Owner: Soviets
 	Actor359: brik
 		Location: 57,63
 		Owner: Soviets
@@ -1281,9 +1209,6 @@ Actors:
 		Location: 73,63
 		Owner: Soviets
 		FreeActor: False
-	Kennel: kenn
-		Location: 64,61
-		Owner: Soviets
 	Actor484: silo
 		Location: 35,100
 		Owner: Soviets
@@ -1439,27 +1364,9 @@ Actors:
 	Actor585: tc04
 		Location: 132,62
 		Owner: Neutral
-	AirForceHQ: miss
-		Location: 77,32
-		Owner: Soviets
 	Actor451: mine
 		Location: 83,50
 		Owner: Neutral
-	Harvester1: harv
-		Location: 73,96
-		Owner: Soviets
-	Harvester2: harv
-		Location: 80,51
-		Owner: Soviets
-	Harvester3: harv
-		Location: 32,103
-		Owner: Soviets
-	MCVInsertLocation: waypoint
-		Location: 71,143
-		Owner: Allies
-	MCVDeployLocation: waypoint
-		Location: 73,133
-		Owner: Allies
 	Actor0: tc05
 		Location: 28,49
 		Owner: Neutral
@@ -1933,30 +1840,6 @@ Actors:
 	Actor430: t16
 		Location: 82,56
 		Owner: Neutral
-	VillageRaidWpt1: waypoint
-		Location: 77,30
-		Owner: Soviets
-	VillageRaidWpt2: waypoint
-		Location: 59,52
-		Owner: Soviets
-	UboatPatrolWpt4: waypoint
-		Location: 61,112
-		Owner: Soviets
-	BaseRaidWpt1: waypoint
-		Location: 105,74
-		Owner: Soviets
-	BaseRaidWpt2: waypoint
-		Location: 128,130
-		Owner: Soviets
-	BaseRaidWpt3: waypoint
-		Location: 118,106
-		Owner: Soviets
-	BaseRaidWpt4: waypoint
-		Location: 116,69
-		Owner: Soviets
-	BaseRaidWpt5: waypoint
-		Location: 141,104
-		Owner: Soviets
 	Actor482: 3tnk
 		Location: 24,43
 		Owner: Soviets
@@ -1968,27 +1851,12 @@ Actors:
 		Location: 20,45
 		Owner: Soviets
 		Facing: 160
-	PatrolWpt1: waypoint
-		Location: 80,78
-		Owner: Soviets
 	Actor593: tc01
 		Location: 97,64
 		Owner: Neutral
 	Actor592: tc03
 		Location: 101,62
 		Owner: Neutral
-	UboatPatrolWpt2: waypoint
-		Location: 64,123
-		Owner: Soviets
-	UboatPatrolWpt3: waypoint
-		Location: 97,123
-		Owner: Soviets
-	VillageRaidEntrypoint: waypoint
-		Location: 143,16
-		Owner: Soviets
-	PatrolWpt2: waypoint
-		Location: 95,55
-		Owner: Soviets
 	Actor594: tc04
 		Location: 96,16
 		Owner: Neutral
@@ -2118,15 +1986,6 @@ Actors:
 	Actor636: t02
 		Location: 123,46
 		Owner: Neutral
-	BaseRearAttackWpt2: waypoint
-		Location: 104,33
-		Owner: Soviets
-	BaseRearAttackWpt3: waypoint
-		Location: 129,57
-		Owner: Soviets
-	BaseRaidEntrypoint: waypoint
-		Location: 16,143
-		Owner: Soviets
 	Actor644: e1
 		Location: 45,39
 		Owner: Soviets
@@ -2160,15 +2019,6 @@ Actors:
 	Actor654: e3
 		Location: 128,44
 		Owner: Soviets
-	BaseRearAttackWpt1: waypoint
-		Location: 22,45
-		Owner: Soviets
-	HarvGuard1: apc
-		Location: 37,98
-		Owner: Soviets
-	HarvGuard2: 3tnk
-		Location: 39,96
-		Owner: Soviets
 	Actor403: silo
 		Location: 36,99
 		Owner: Soviets
@@ -2184,12 +2034,114 @@ Actors:
 	Actor401: silo
 		Location: 36,100
 		Owner: Soviets
-	GroundAttackWpt1: waypoint
-		Location: 29,64
-		Owner: Soviets
 	Actor656: tc01
 		Location: 26,109
 		Owner: Neutral
+	Actor14: wood
+		Location: 23,57
+		Owner: Neutral
+	CameraSpot: CAMERA
+		Location: 79,137
+		Owner: Allies
+	EasyMine: mine
+		Location: 122,112
+		Owner: Neutral
+	SubPen: spen
+		Location: 26,84
+		Owner: Soviets
+	Uboat1: ss
+		Location: 17,92
+		Owner: Soviets
+		Facing: 128
+	Uboat2: ss
+		Location: 20,91
+		Owner: Soviets
+		Facing: 128
+	Uboat3: ss
+		Location: 17,112
+		Owner: Soviets
+		Facing: 192
+	Uboat4: ss
+		Location: 34,120
+		Owner: Soviets
+		Facing: 160
+	Uboat5: ss
+		Location: 24,126
+		Owner: Soviets
+		Facing: 160
+	Uboat6: ss
+		Location: 29,131
+		Owner: Soviets
+		Facing: 192
+	WarFactory: weap
+		Location: 70,72
+		Owner: Soviets
+	Barracks: barr
+		Location: 67,63
+		Owner: Soviets
+	AirForceHQ: miss
+		Location: 77,32
+		Owner: Soviets
+	Kennel: kenn
+		Location: 64,61
+		Owner: Soviets
+	Harvester1: harv
+		Location: 73,96
+		Owner: Soviets
+	Harvester2: harv
+		Location: 80,51
+		Owner: Soviets
+	Harvester3: harv
+		Location: 32,103
+		Owner: Soviets
+	HarvGuard1: apc
+		Location: 37,98
+		Owner: Soviets
+	HarvGuard2: 3tnk
+		Location: 39,96
+		Owner: Soviets
+	HarvGuard3: ftrk
+		Location: 46,95
+		Owner: Soviets
+	FarmHouse1: asianhut
+		Location: 26,23
+		Owner: Civilians
+	FarmHouse2: v10
+		Location: 26,30
+		Owner: Civilians
+	FarmHouse3: v06
+		Location: 21,19
+		Owner: Civilians
+	FarmHouse4: v09
+		Location: 19,29
+		Owner: Civilians
+	FarmHouse5: v03
+		Location: 17,21
+		Owner: Civilians
+	FarmHouse6: v02
+		Location: 24,19
+		Owner: Civilians
+	FarmHouse7: v04
+		Location: 17,24
+		Owner: Civilians
+	FarmHouse8: v07
+		Location: 29,21
+		Owner: Civilians
+	FarmHouse9: v05
+		Location: 23,28
+		Owner: Civilians
+	Church: v01
+		Location: 21,23
+		Owner: Civilians
+	GroundAttackWpt1: waypoint
+		Location: 29,64
+		Owner: Soviets
+	MCVInsertLocation: waypoint
+		Location: 71,143
+		Owner: Allies
+	MCVDeployLocation: waypoint
+		Location: 73,133
+		Owner: Allies
 	AlliedAreaTopLeft: waypoint
 		Location: 97,66
 		Owner: Neutral
@@ -2199,12 +2151,60 @@ Actors:
 	Rallypoint: waypoint
 		Location: 64,74
 		Owner: Soviets
-	Actor14: wood
-		Location: 23,57
-		Owner: Neutral
-	CameraSpot: CAMERA
-		Location: 79,137
-		Owner: Allies
+	PatrolWpt1: waypoint
+		Location: 80,78
+		Owner: Soviets
+	PatrolWpt2: waypoint
+		Location: 95,55
+		Owner: Soviets
+	UboatPatrolWpt1: waypoint
+		Location: 52,129
+		Owner: Soviets
+	UboatPatrolWpt2: waypoint
+		Location: 64,123
+		Owner: Soviets
+	UboatPatrolWpt3: waypoint
+		Location: 97,123
+		Owner: Soviets
+	UboatPatrolWpt4: waypoint
+		Location: 61,112
+		Owner: Soviets
+	VillageRaidEntrypoint: waypoint
+		Location: 143,16
+		Owner: Soviets
+	VillageRaidWpt1: waypoint
+		Location: 77,30
+		Owner: Soviets
+	VillageRaidWpt2: waypoint
+		Location: 59,52
+		Owner: Soviets
+	BaseRaidEntrypoint: waypoint
+		Location: 16,143
+		Owner: Soviets
+	BaseRaidWpt1: waypoint
+		Location: 105,74
+		Owner: Soviets
+	BaseRaidWpt2: waypoint
+		Location: 128,130
+		Owner: Soviets
+	BaseRaidWpt3: waypoint
+		Location: 118,106
+		Owner: Soviets
+	BaseRaidWpt4: waypoint
+		Location: 116,69
+		Owner: Soviets
+	BaseRaidWpt5: waypoint
+		Location: 141,104
+		Owner: Soviets
+	BaseRearAttackWpt1: waypoint
+		Location: 22,45
+		Owner: Soviets
+	BaseRearAttackWpt2: waypoint
+		Location: 104,33
+		Owner: Soviets
+	BaseRearAttackWpt3: waypoint
+		Location: 129,57
+		Owner: Soviets
 
 Smudges:
 
diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml
index de19e14b8b..b57f0861d1 100644
--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -1421,9 +1421,6 @@ Actors:
 	Actor442: miss
 		Location: 86,33
 		Owner: BadGuy
-	SuperTankDome: dome.NoInfiltrate
-		Location: 90,32
-		Owner: BadGuy
 	Actor444: ftur
 		Location: 91,47
 		Owner: BadGuy
@@ -1527,13 +1524,6 @@ Actors:
 	Actor477: apwr
 		Location: 89,78
 		Owner: USSR
-	USSRSpen: spen
-		Location: 32,56
-		Owner: BadGuy
-		Health: 0.6875
-	USSROutpostSilo: silo
-		Location: 37,61
-		Owner: BadGuy
 	Actor480: powr
 		Location: 34,61
 		Owner: BadGuy
@@ -1564,15 +1554,9 @@ Actors:
 	Actor489: brl3
 		Location: 37,65
 		Owner: USSR
-	ExplosiveBarrel1: brl3
-		Location: 38,62
-		Owner: USSR
 	Actor491: brl3
 		Location: 28,62
 		Owner: USSR
-	ExplosiveBarrel2: brl3
-		Location: 28,60
-		Owner: USSR
 	Actor493: brl3
 		Location: 30,61
 		Owner: USSR
@@ -1600,12 +1584,6 @@ Actors:
 	Actor501: barl
 		Location: 39,63
 		Owner: USSR
-	FlameTurret1: ftur
-		Location: 30,64
-		Owner: BadGuy
-	FlameTurret2: ftur
-		Location: 33,66
-		Owner: BadGuy
 	Actor504: brl3
 		Location: 37,66
 		Owner: BadGuy
@@ -1615,14 +1593,6 @@ Actors:
 	Actor506: barl
 		Location: 38,66
 		Owner: BadGuy
-	AlliedBaseProc: proc
-		Location: 27,25
-		Owner: Outpost
-		Health: 0.3476563
-		FreeActor: False
-	AlliedBaseHarv: harv
-		Location: 30,26
-		Owner: Neutral
 	Actor508: silo
 		Location: 36,18
 		Owner: Outpost
@@ -1643,12 +1613,6 @@ Actors:
 		Location: 23,23
 		Owner: Outpost
 		Health: 0.1367188
-	Hospital: hosp
-		Location: 43,43
-		Owner: Neutral
-	DemitriChurch: v01
-		Location: 28,99
-		Owner: Neutral
 	Actor515: v02
 		Location: 23,99
 		Owner: Neutral
@@ -1859,15 +1823,6 @@ Actors:
 	Actor584: brl3
 		Location: 89,53
 		Owner: Ukraine
-	stnk1: 5tnk
-		Location: 89,59
-		Owner: Turkey
-	stnk2: 5tnk
-		Location: 77,57
-		Owner: Turkey
-	stnk3: 5tnk
-		Location: 94,53
-		Owner: Turkey
 	Actor588: v2rl
 		Location: 91,75
 		Owner: USSR
@@ -2024,6 +1979,60 @@ Actors:
 		Owner: BadGuy
 		Facing: 224
 		SubCell: 2
+	Actor507: v11
+		Location: 97,56
+		Owner: Ukraine
+	Actor513: brl3
+		Location: 85,56
+		Owner: Ukraine
+	Actor514: brl3
+		Location: 97,59
+		Owner: Ukraine
+	SuperTankDome: dome.NoInfiltrate
+		Location: 90,32
+		Owner: BadGuy
+	USSRSpen: spen
+		Location: 32,56
+		Owner: BadGuy
+		Health: 0.6875
+	USSROutpostSilo: silo
+		Location: 37,61
+		Owner: BadGuy
+	ExplosiveBarrel1: brl3
+		Location: 38,62
+		Owner: USSR
+	ExplosiveBarrel2: brl3
+		Location: 28,60
+		Owner: USSR
+	FlameTurret1: ftur
+		Location: 30,64
+		Owner: BadGuy
+	FlameTurret2: ftur
+		Location: 33,66
+		Owner: BadGuy
+	AlliedBaseProc: proc
+		Location: 27,25
+		Owner: Outpost
+		Health: 0.3476563
+		FreeActor: False
+	AlliedBaseHarv: harv
+		Location: 30,26
+		Owner: Neutral
+	Hospital: hosp
+		Location: 43,43
+		Owner: Neutral
+	DemitriChurch: v01
+		Location: 28,99
+		Owner: Neutral
+	stnk1: 5tnk
+		Location: 89,59
+		Owner: Turkey
+	stnk2: 5tnk
+		Location: 77,57
+		Owner: Turkey
+	stnk3: 5tnk
+		Location: 94,53
+		Owner: Turkey
 	DemitriLZ: waypoint
 		Location: 30,21
 		Owner: Neutral
@@ -2063,15 +2072,6 @@ Actors:
 	AlliedBaseEntryPoint: waypoint
 		Location: 42,16
 		Owner: Neutral
-	Actor507: v11
-		Location: 97,56
-		Owner: Ukraine
-	Actor513: brl3
-		Location: 85,56
-		Owner: Ukraine
-	Actor514: brl3
-		Location: 97,59
-		Owner: Ukraine
 	AlliedBaseEntryRight: waypoint
 		Location: 29,32
 		Owner: Neutral
diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml
index 2f813e36ac..5ba871360e 100644
--- a/mods/ra/maps/survival01/map.yaml
+++ b/mods/ra/maps/survival01/map.yaml
@@ -305,7 +305,7 @@ Actors:
 	Actor60: brik
 		Location: 56,56
 		Owner: Allies
-	Actor 408: weap
+	Actor408: weap
 		Location: 53,46
 		Owner: Allies
 	Actor32: tent
@@ -455,18 +455,6 @@ Actors:
 	Actor141: fenc
 		Location: 78,11
 		Owner: Neutral
-	Sam3: sam
-		Location: 76,11
-		Owner: Soviets
-	SovietAirfield1: afld.mission
-		Location: 86,5
-		Owner: Soviets
-	SovietAirfield2: afld.mission
-		Location: 80,6
-		Owner: Soviets
-	SovietAirfield3: afld.mission
-		Location: 75,5
-		Owner: Soviets
 	Actor160: fenc
 		Location: 77,4
 		Owner: Neutral
@@ -602,9 +590,6 @@ Actors:
 	Actor181: fenc
 		Location: 90,7
 		Owner: Neutral
-	Refinery: proc
-		Location: 81,11
-		Owner: Soviets
 	Actor187: t11
 		Location: 69,10
 		Owner: Neutral
@@ -635,21 +620,9 @@ Actors:
 	Actor192: fenc
 		Location: 74,16
 		Owner: Neutral
-	FlameTower3: ftur
-		Location: 78,17
-		Owner: Soviets
 	Actor190: fenc
 		Location: 74,14
 		Owner: Neutral
-	AdvancedPowerPlant3: apwr
-		Location: 88,12
-		Owner: Soviets
-	Silo1: silo
-		Location: 84,13
-		Owner: Soviets
-	Silo2: silo
-		Location: 84,12
-		Owner: Soviets
 	Actor199: e1
 		Location: 79,15
 		Owner: Soviets
@@ -680,9 +653,6 @@ Actors:
 	Actor208: tc03
 		Location: 40,21
 		Owner: Neutral
-	Sam1: sam
-		Location: 62,27
-		Owner: Soviets
 	Actor210: tc04
 		Location: 34,22
 		Owner: Neutral
@@ -764,24 +734,12 @@ Actors:
 	Actor232: brik
 		Location: 11,17
 		Owner: Neutral
-	FlameTower1: ftur
-		Location: 23,16
-		Owner: Soviets
-	FlameTower2: ftur
-		Location: 29,13
-		Owner: Soviets
 	Actor307: v2rl
 		Location: 31,9
 		Owner: Soviets
 	Actor306: v2rl
 		Location: 31,18
 		Owner: Soviets
-	RadarDome: dome
-		Location: 14,16
-		Owner: Soviets
-	AdvancedPowerPlant1: apwr
-		Location: 24,5
-		Owner: Soviets
 	Actor234: brik
 		Location: 12,16
 		Owner: Neutral
@@ -842,9 +800,6 @@ Actors:
 	Actor259: brik
 		Location: 27,19
 		Owner: Neutral
-	Sam2: sam
-		Location: 17,31
-		Owner: Soviets
 	Actor264: brik
 		Location: 32,19
 		Owner: Neutral
@@ -926,12 +881,6 @@ Actors:
 	Actor268: brik
 		Location: 33,19
 		Owner: Neutral
-	WarFactory: weap
-		Location: 22,12
-		Owner: Soviets
-	AdvancedPowerPlant2: apwr
-		Location: 16,13
-		Owner: Soviets
 	Actor258: brik
 		Location: 26,18
 		Owner: Neutral
@@ -947,9 +896,6 @@ Actors:
 	Actor309: e1
 		Location: 52,44
 		Owner: Allies
-	Barrack1: barr
-		Location: 28,7
-		Owner: Soviets
 	Actor305: v2rl
 		Location: 17,18
 		Owner: Soviets
@@ -968,9 +914,6 @@ Actors:
 	Actor302: e3
 		Location: 28,10
 		Owner: Soviets
-	Sam4: sam
-		Location: 29,17
-		Owner: Soviets
 	Actor310: e1
 		Location: 50,47
 		Owner: Allies
@@ -1088,9 +1031,6 @@ Actors:
 	Actor340: barl
 		Location: 73,52
 		Owner: Allies
-	SubPen: spen
-		Location: 13,9
-		Owner: Soviets
 	Actor297: brik
 		Location: 22,4
 		Owner: Neutral
@@ -1109,6 +1049,66 @@ Actors:
 	Actor1000: camera.large
 		Location: 1,1
 		Owner: Soviets
+	FlameTower3: ftur
+		Location: 78,17
+		Owner: Soviets
+	AdvancedPowerPlant3: apwr
+		Location: 88,12
+		Owner: Soviets
+	Silo1: silo
+		Location: 84,13
+		Owner: Soviets
+	Silo2: silo
+		Location: 84,12
+		Owner: Soviets
+	Refinery: proc
+		Location: 81,11
+		Owner: Soviets
+	SovietAirfield1: afld.mission
+		Location: 86,5
+		Owner: Soviets
+	SovietAirfield2: afld.mission
+		Location: 80,6
+		Owner: Soviets
+	SovietAirfield3: afld.mission
+		Location: 75,5
+		Owner: Soviets
+	FlameTower1: ftur
+		Location: 23,16
+		Owner: Soviets
+	FlameTower2: ftur
+		Location: 29,13
+		Owner: Soviets
+	Sam1: sam
+		Location: 62,27
+		Owner: Soviets
+	Sam2: sam
+		Location: 17,31
+		Owner: Soviets
+	Sam3: sam
+		Location: 76,11
+		Owner: Soviets
+	Sam4: sam
+		Location: 29,17
+		Owner: Soviets
+	RadarDome: dome
+		Location: 14,16
+		Owner: Soviets
+	SubPen: spen
+		Location: 13,9
+		Owner: Soviets
+	Barrack1: barr
+		Location: 28,7
+		Owner: Soviets
+	WarFactory: weap
+		Location: 22,12
+		Owner: Soviets
+	AdvancedPowerPlant1: apwr
+		Location: 24,5
+		Owner: Soviets
+	AdvancedPowerPlant2: apwr
+		Location: 16,13
+		Owner: Soviets
 	BadgerEntryPoint1: waypoint
 		Location: 1,54
 		Owner: Neutral