diff --git a/cgmes/cgmes-model/src/main/resources/CIM16.sparql b/cgmes/cgmes-model/src/main/resources/CIM16.sparql
index bae7ca1b6db..e81bcb2a774 100644
--- a/cgmes/cgmes-model/src/main/resources/CIM16.sparql
+++ b/cgmes/cgmes-model/src/main/resources/CIM16.sparql
@@ -766,11 +766,6 @@ WHERE {
     OPTIONAL { ?EnergyConsumer cim:EnergyConsumer.pfixed ?pfixed }
     OPTIONAL { ?EnergyConsumer cim:EnergyConsumer.qfixed ?qfixed }
 }}
-OPTIONAL { GRAPH ?graphSSH {
-    ?EnergyConsumer
-        cim:EnergyConsumer.p ?p ;
-        cim:EnergyConsumer.q ?q
-}}
 }
 
 # query: energySources
@@ -782,11 +777,6 @@ WHERE {
         cim:IdentifiedObject.name ?name .
     ?Terminal cim:Terminal.ConductingEquipment ?EnergySource
 }}
-OPTIONAL { GRAPH ?graphSSH {
-    ?EnergySource
-        cim:EnergySource.activePower ?p ;
-        cim:EnergySource.reactivePower ?q
-}}
 }
 
 # query: shuntCompensators
@@ -1039,13 +1029,6 @@ WHERE {
         cim:IdentifiedObject.name ?name .
     ?Terminal cim:Terminal.ConductingEquipment ?AsynchronousMachine .
 }}
-OPTIONAL { GRAPH ?graphSSH  {
-    ?AsynchronousMachine
-        cim:AsynchronousMachine.asynchronousMachineType ?type ;
-        cim:RotatingMachine.p ?p ;
-        cim:RotatingMachine.q ?q ;
-        cim:RegulatingCondEq.controlEnabled ?controlEnabled
-}}
 }
 
 # query: controlAreas