Index: ps/trunk/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
+++ ps/trunk/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js
@@ -137,10 +137,7 @@
 Trigger.prototype.SetDisableTemplates = function()
 {
 	for (let i = 1; i < TriggerHelper.GetNumberOfPlayers(); ++i)
-	{
-		let cmpPlayer = QueryPlayerIDInterface(i);
-		cmpPlayer.SetDisabledTemplates(disabledTemplates(cmpPlayer.GetCiv()));
-	}
+		QueryPlayerIDInterface(i).SetDisabledTemplates(disabledTemplates(QueryPlayerIDInterface(i, IID_Identity).GetCiv()));
 };
 
 /**
Index: ps/trunk/binaries/data/mods/public/maps/scripts/Regicide.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scripts/Regicide.js
+++ ps/trunk/binaries/data/mods/public/maps/scripts/Regicide.js
@@ -5,7 +5,7 @@
 
 	let playersCivs = [];
 	for (let playerID = 1; playerID < TriggerHelper.GetNumberOfPlayers(); ++playerID)
-		playersCivs[playerID] = QueryPlayerIDInterface(playerID).GetCiv();
+		playersCivs[playerID] = QueryPlayerIDInterface(playerID, IID_Identity).GetCiv();
 
 	// Get all hero templates of these civs
 	let heroTemplates = {};
Index: ps/trunk/binaries/data/mods/public/simulation/components/Trainer.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Trainer.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Trainer.js
@@ -691,11 +691,6 @@
 	return usedTime;
 };
 
-Trainer.prototype.OnCivChanged = function()
-{
-	this.CalculateEntitiesMap();
-};
-
 Trainer.prototype.OnOwnershipChanged = function(msg)
 {
 	if (msg.to != INVALID_PLAYER)
Index: ps/trunk/binaries/data/mods/public/simulation/components/interfaces/Player.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/interfaces/Player.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/interfaces/Player.js
@@ -1,11 +1,4 @@
 /**
- * Message of the form { "player": number, "from": string, "to": string }
- * sent from Player component to warn other components when a player changed civs.
- * This should only happen in Atlas.
- */
-Engine.RegisterMessageType("CivChanged");
-
-/**
  * Message of the form { "player": number, "otherPlayer": number }
  * sent from Player component when diplomacy changed for one player or between two players.
  */