diff --git a/mods/ra/maps/allies-03a/allies03a.lua b/mods/ra/maps/allies-03a/allies03a.lua
index c6dca59d3b..2988484227 100644
--- a/mods/ra/maps/allies-03a/allies03a.lua
+++ b/mods/ra/maps/allies-03a/allies03a.lua
@@ -189,8 +189,8 @@ InitTriggers = function()
 			end
 		end)
 	end)
-	Trigger.OnAllRemovedFromWorld(FirstUSSRBase, function()
-		if baseCamera then
+	Trigger.OnAllKilledOrCaptured(FirstUSSRBase, function()
+		if baseCamera and baseCamera.IsInWorld then
 			baseCamera.Destroy()
 		end
 	end)
diff --git a/mods/ra/maps/allies-03b/allies03b.lua b/mods/ra/maps/allies-03b/allies03b.lua
index bb7d9d48c7..2cf08a121a 100644
--- a/mods/ra/maps/allies-03b/allies03b.lua
+++ b/mods/ra/maps/allies-03b/allies03b.lua
@@ -252,8 +252,8 @@ InitTriggers = function()
 			AlertFirstBase()
 		end)
 	end)
-	Trigger.OnAllRemovedFromWorld(FirstUSSRBase, function()
-		if baseCamera then
+	Trigger.OnAllKilledOrCaptured(FirstUSSRBase, function()
+		if baseCamera and baseCamera.IsInWorld then
 			baseCamera.Destroy()
 		end
 	end)
diff --git a/mods/ra/maps/allies-07/allies07.lua b/mods/ra/maps/allies-07/allies07.lua
index a91ef82ab4..4a7aa950e7 100644
--- a/mods/ra/maps/allies-07/allies07.lua
+++ b/mods/ra/maps/allies-07/allies07.lua
@@ -85,7 +85,7 @@ BaseRaids = function()
 	if Map.LobbyOption("difficulty") == "easy" then
 		return
 	else
-		Trigger.AfterDelay(Utils.RandomInteger(BaseRaidDelay1[1], BaseRaidDelay1[2]), function()	
+		Trigger.AfterDelay(Utils.RandomInteger(BaseRaidDelay1[1], BaseRaidDelay1[2]), function()
 			local raiders = Reinforcements.ReinforceWithTransport(ussr, "lst", RaidingParty, RaidOnePath, { RaidOneEntry.Location })[2]
 			Utils.Do(raiders, function(a)
 				Trigger.OnAddedToWorld(a, function()
@@ -95,7 +95,7 @@ BaseRaids = function()
 			end)
 		end)
 
-		Trigger.AfterDelay(Utils.RandomInteger(BaseRaidDelay2[1], BaseRaidDelay2[2]), function()	
+		Trigger.AfterDelay(Utils.RandomInteger(BaseRaidDelay2[1], BaseRaidDelay2[2]), function()
 			local raiders = Reinforcements.ReinforceWithTransport(ussr, "lst", RaidingParty, RaidTwoPath, { RaidTwoEntry.Location })[2]
 			Utils.Do(raiders, function(a)
 				Trigger.OnAddedToWorld(a, function()
@@ -126,7 +126,7 @@ FinishTimer = function()
 	Trigger.AfterDelay(DateTime.Seconds(6), function() UserInterface.SetMissionText("") end)
 end
 
-BattalionWays = 
+BattalionWays =
 {
 	{ HardEntry1.Location, HardLanding1.Location },
 	{ HardEntry2.Location, HardLanding2.Location },
@@ -138,7 +138,7 @@ BattalionWays =
 
 SendArmoredBattalion = function()
 	Media.PlaySpeechNotification(greece, "EnemyUnitsApproaching")
-	Utils.Do(BattalionWays, function(way) 
+	Utils.Do(BattalionWays, function(way)
 		local units = { "3tnk", "3tnk", "3tnk", "4tnk", "4tnk" }
 		local armor = Reinforcements.ReinforceWithTransport(ussr, "lst", units , way, { way[2], way[1] })[2]
 		Utils.Do(armor, function(a)
@@ -146,7 +146,7 @@ SendArmoredBattalion = function()
 				a.AttackMove(PlayerBase.Location)
 				IdleHunt(a)
 			end)
-		end)	
+		end)
 	end)
 end
 
@@ -217,6 +217,6 @@ WorldLoaded = function()
 	Trigger.AfterDelay(ActivateAIDelay, ActivateAI)
 	Trigger.AfterDelay(StartTimerDelay, StartTimerFunction)
 
-	Trigger.OnAllRemovedFromWorld(DestroySubPensTriggerActivator, DestroySubPensCompleted)
+	Trigger.OnAllKilledOrCaptured(DestroySubPensTriggerActivator, DestroySubPensCompleted)
 	Trigger.OnAllRemovedFromWorld(ClearSubActivityTriggerActivator, ClearSubActivityCompleted)
 end
diff --git a/mods/ra/maps/infiltration/infiltration.lua b/mods/ra/maps/infiltration/infiltration.lua
index 6afd495df0..769d1b58e6 100644
--- a/mods/ra/maps/infiltration/infiltration.lua
+++ b/mods/ra/maps/infiltration/infiltration.lua
@@ -286,8 +286,7 @@ SovietBaseMaintenanceSetup = function()
 			and a.HasProperty("StartBuildingRepairs") and a.HasProperty("Sell")
 	end)
 
-	-- This includes killed, captured (actor is temporarily removed) and sold.
-	Trigger.OnAllRemovedFromWorld(sovietbuildings, function()
+	Trigger.OnAllKilledOrCaptured(sovietbuildings, function()
 		Utils.Do(humans, function(player)
 			player.MarkCompletedObjective(destroyBase)
 		end)