diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js b/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
index c965c85d40..288b648e1d 100644
--- a/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
+++ b/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
@@ -149,7 +149,7 @@ Trigger.prototype.InitGame = function()
 	/* Until we can do something about limiting the victory conditions available for this map to "None"
 	for (var i = 1; i < numberOfPlayers; ++i)
 	{
-		var cmpPlayer = TriggerHelper.GetPlayerComponent(i);
+		var cmpPlayer = QueryPlayerIDInterface(i);
 		for (var j = 1; j < numberOfPlayers; ++j)
 			if (i != j) 
 				cmpPlayer.SetAlly(j);
@@ -157,7 +157,7 @@ Trigger.prototype.InitGame = function()
 	}*/
 	
 	// Make gaia black
-	TriggerHelper.GetPlayerComponent(0).SetColor(0, 0, 0);
+	QueryPlayerIDInterface(0).SetColor(0, 0, 0);
 	
 	// Place the treasures
 	this.PlaceTreasures();
@@ -165,7 +165,7 @@ Trigger.prototype.InitGame = function()
 	// Disable farms, civic centers and walls for all players 
  	for (var i = 1; i < numberOfPlayers; ++i) 
  	{ 
-		var cmpPlayer = TriggerHelper.GetPlayerComponent(i); 
+		let cmpPlayer = QueryPlayerIDInterface(i);
 		var civ = cmpPlayer.GetCiv(); 
 		cmpPlayer.SetDisabledTemplates([
 			"structures/" + civ + "_field",
@@ -215,7 +215,7 @@ Trigger.prototype.DefeatPlayerOnceCCIsDestroyed = function(data)
 		var numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
 		for (var i = 1; i < numberOfPlayers; ++i)
 		{
-			if (TriggerHelper.GetPlayerComponent(i).GetState() == "active")
+			if (QueryPlayerIDInterface(i).GetState() == "active")
 			{
 				lastPlayerStanding = i;
 				++numPlayersStanding;
diff --git a/binaries/data/mods/public/maps/scripts/TriggerHelper.js b/binaries/data/mods/public/maps/scripts/TriggerHelper.js
index 242c957e06..031739e15e 100644
--- a/binaries/data/mods/public/maps/scripts/TriggerHelper.js
+++ b/binaries/data/mods/public/maps/scripts/TriggerHelper.js
@@ -45,7 +45,7 @@ TriggerHelper.SpawnUnits = function(source, template, count, owner)
 	if (owner == null)
 		owner = TriggerHelper.GetOwner(source);
 
-	for (let i = 0; i < count; i++)
+	for (let i = 0; i < count; ++i)
 	{
 		let ent = Engine.AddEntity(template);
 		let cmpEntPosition = Engine.QueryInterface(ent, IID_Position);
@@ -101,17 +101,6 @@ TriggerHelper.SpawnUnitsFromTriggerPoints = function(ref, template, count, owner
 	return entities;
 };
 
-/**
- * Returs a function that can be used to filter an array of entities by player
- */
-TriggerHelper.GetPlayerFilter = function(playerID)
-{
-	return function(entity) {
-		let cmpOwnership = Engine.QueryInterface(entity, IID_Ownership);
-		return cmpOwnership && cmpOwnership.GetOwner() == playerID;
-	};
-};
-
 /**
  * Returns the resource type that can be gathered from an entity
  */
@@ -138,8 +127,8 @@ TriggerHelper.SetPlayerWon = function(playerID)
  */
 TriggerHelper.DefeatPlayer = function(playerID)
 {
-	let cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-	let playerEnt = cmpPlayerMan.GetPlayerByID(playerID);
+	let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+	let playerEnt = cmpPlayerManager.GetPlayerByID(playerID);
 
 	Engine.PostMessage(playerEnt, MT_PlayerDefeated, { "playerId": playerID } );
 };
@@ -153,15 +142,6 @@ TriggerHelper.GetNumberOfPlayers = function()
 	return cmpPlayerManager.GetNumPlayers();
 };
 
-/**
- * Returns the player component. For more information on its functions, see simulation/components/Player.js
- */
-TriggerHelper.GetPlayerComponent = function(playerID)
-{
-	let cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-	return Engine.QueryInterface(cmpPlayerMan.GetPlayerByID(playerID), IID_Player);
-};
-
 /**
  * A function to determine if an entity has a specific class
  * @param entity ID of the entity that we want to check for classes
diff --git a/binaries/data/mods/public/maps/scripts/WonderVictory.js b/binaries/data/mods/public/maps/scripts/WonderVictory.js
index 0234502e35..243096a510 100644
--- a/binaries/data/mods/public/maps/scripts/WonderVictory.js
+++ b/binaries/data/mods/public/maps/scripts/WonderVictory.js
@@ -28,7 +28,7 @@ Trigger.prototype.CheckWonderVictory = function(data)
 
 	// Add -1 to notify observers too
 	let players = [-1];
-	for (let i = 1; i < numPlayers; i++)
+	for (let i = 1; i < numPlayers; ++i)
 		if (i != data.to)
 			players.push(i);