Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -227,7 +227,7 @@
 	if (!cmpThisPosition || !cmpTargetPosition || !cmpThisPosition.IsInWorld() || !cmpTargetPosition.IsInWorld())
 		return false;
 
-	let cmpIdentity = QueryMiragedInterface(target, IID_Identity);
+	let cmpIdentity = Engine.QueryInterface(target, IID_Identity);
 	if (!cmpIdentity)
 		return false;
 
Index: binaries/data/mods/public/simulation/components/Fogging.js
===================================================================
--- binaries/data/mods/public/simulation/components/Fogging.js
+++ binaries/data/mods/public/simulation/components/Fogging.js
@@ -112,10 +112,6 @@
 	cmpMirageVisualActor.SetActorSeed(cmpParentVisualActor.GetActorSeed());
 
 	// Store valuable information into the mirage component (especially for the GUI)
-	var cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
-	if (cmpIdentity)
-		cmpMirage.CopyIdentity(cmpIdentity);
-
 	var cmpFoundation = Engine.QueryInterface(this.entity, IID_Foundation);
 	if (cmpFoundation)
 		cmpMirage.CopyFoundation(cmpFoundation);
Index: binaries/data/mods/public/simulation/components/Mirage.js
===================================================================
--- binaries/data/mods/public/simulation/components/Mirage.js
+++ binaries/data/mods/public/simulation/components/Mirage.js
@@ -63,14 +63,6 @@
 // ============================
 // Parent entity data
 
-Mirage.prototype.CopyIdentity = function(cmpIdentity)
-{
-	this.miragedIids.add(IID_Identity);
-	this.classesList = cmpIdentity.GetClassesList();
-};
-
-Mirage.prototype.GetClassesList = function() { return this.classesList };
-
 // Foundation data
 
 Mirage.prototype.CopyFoundation = function(cmpFoundation)
Index: binaries/data/mods/public/simulation/templates/special/filter/mirage.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/filter/mirage.xml
+++ binaries/data/mods/public/simulation/templates/special/filter/mirage.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity filtered="">
   <Footprint merge=""/>
-  <Identity filtered="">
-    <Civ merge=""/>
-    <GenericName merge=""/>
-    <SpecificName merge=""/>
-    <Tooltip merge=""/>
-    <History merge=""/>
-    <Icon merge=""/>
-  </Identity>
+  <Identity merge=""/>
   <Minimap merge=""/>
   <Mirage replace=""/>
   <Obstruction merge="">