diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
index 6aaf0990..cfd2358b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
@@ -235,22 +235,7 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="y1G8y66_QY" role="3cqZAp">
-          <node concept="3cpWsn" id="y1G8y66_QZ" role="3cpWs9">
-            <property role="TrG5h" value="myProject" />
-            <node concept="3uibUv" id="y1G8y66_Oo" role="1tU5fm">
-              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-            </node>
-            <node concept="2YIFZM" id="2u7UHDCh3mq" role="33vP2m">
-              <ref role="37wK5l" to="agne:1fyC0RHInUp" resolve="getMPSProjectForNode" />
-              <ref role="1Pybhc" to="agne:1fyC0RHIfK6" resolve="ProjectHelper" />
-              <node concept="37vLTw" id="y1G8y67ZRS" role="37wK5m">
-                <ref role="3cqZAo" node="y1G8y68boG" resolve="node" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="y1G8y68aRD" role="3cqZAp" />
+        <node concept="3clFbH" id="4VhhwF2tqvR" role="3cqZAp" />
         <node concept="3clFbF" id="y1G8y67uut" role="3cqZAp">
           <node concept="3cmrfG" id="y1G8y67uus" role="3clFbG">
             <property role="3cmrfH" value="1" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.constraints.mps
index 474c50f7..ab7593e5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.constraints.mps
@@ -54,28 +54,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="1M2fIO" id="y1G8y66Ele">
-    <ref role="1M2myG" to="9br2:y1G8y66EiD" resolve="ProjectExpression" />
-    <node concept="9S07l" id="y1G8y66Elf" role="9Vyp8">
-      <node concept="3clFbS" id="y1G8y66Elg" role="2VODD2">
-        <node concept="3clFbF" id="y1G8y66Epa" role="3cqZAp">
-          <node concept="2OqwBi" id="y1G8y66ERY" role="3clFbG">
-            <node concept="2OqwBi" id="y1G8y66Eya" role="2Oq$k0">
-              <node concept="nLn13" id="y1G8y66Ep9" role="2Oq$k0" />
-              <node concept="2Xjw5R" id="y1G8y66EDG" role="2OqNvi">
-                <node concept="1xMEDy" id="y1G8y66EDI" role="1xVPHs">
-                  <node concept="chp4Y" id="y1G8y66EHA" role="ri$Ld">
-                    <ref role="cht4Q" to="9br2:1vid6hjrqXf" resolve="ModelCheck" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3x8VRR" id="y1G8y66F2G" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="y1G8y66PHm">
     <ref role="1M2myG" to="9br2:y1G8y66PGV" resolve="ConceptFunctionParameter_node" />
     <node concept="9S07l" id="y1G8y66PHn" role="9Vyp8">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
index 4f469c8d..4b37dcec 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
@@ -383,12 +383,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="y1G8y66Ej4">
-    <ref role="1XX52x" to="9br2:y1G8y66EiD" resolve="ProjectExpression" />
-    <node concept="3F0ifn" id="y1G8y66Ej6" role="2wV5jI">
-      <property role="3F0ifm" value="project" />
-    </node>
-  </node>
   <node concept="24kQdi" id="y1G8y68MHf">
     <ref role="1XX52x" to="9br2:y1G8y68MHa" resolve="ModelElementWord" />
     <node concept="3EZMnI" id="y1G8y68MHh" role="2wV5jI">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps
index 2abfae9d..f70c1771 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.structure.mps
@@ -127,12 +127,6 @@
     <property role="TrG5h" value="ModelCheckConceptFunction" />
     <ref role="1TJDcQ" to="tpee:gyVMwX8" resolve="ConceptFunction" />
   </node>
-  <node concept="1TIwiD" id="y1G8y66EiD">
-    <property role="EcuMT" value="612965124711031977" />
-    <property role="TrG5h" value="ProjectExpression" />
-    <property role="34LRSv" value="project" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-  </node>
   <node concept="1TIwiD" id="y1G8y66PGV">
     <property role="EcuMT" value="612965124711078715" />
     <property role="TrG5h" value="ConceptFunctionParameter_node" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
index 5e0c35cb..26726ae6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
@@ -60,22 +60,11 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
-      <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
-        <child id="1185788644032" name="normalType" index="mwGJk" />
-      </concept>
       <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
         <child id="1175517851849" name="errorString" index="2MkJ7o" />
       </concept>
@@ -91,21 +80,12 @@
       <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
         <reference id="1174642800329" name="concept" index="1YaFvo" />
       </concept>
-      <concept id="1174643105530" name="jetbrains.mps.lang.typesystem.structure.InferenceRule" flags="ig" index="1YbPZF" />
       <concept id="1174648085619" name="jetbrains.mps.lang.typesystem.structure.AbstractRule" flags="ng" index="1YuPPy">
         <child id="1174648101952" name="applicableNode" index="1YuTPh" />
       </concept>
       <concept id="1174650418652" name="jetbrains.mps.lang.typesystem.structure.ApplicableNodeReference" flags="nn" index="1YBJjd">
         <reference id="1174650432090" name="applicableNode" index="1YBMHb" />
       </concept>
-      <concept id="1174657487114" name="jetbrains.mps.lang.typesystem.structure.TypeOfExpression" flags="nn" index="1Z2H0r">
-        <child id="1174657509053" name="term" index="1Z2MuG" />
-      </concept>
-      <concept id="1174658326157" name="jetbrains.mps.lang.typesystem.structure.CreateEquationStatement" flags="nn" index="1Z5TYs" />
-      <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
-        <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
-        <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
-      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
@@ -276,30 +256,5 @@
       <ref role="1YaFvo" to="9br2:1vid6hjrqXc" resolve="ModelChecksContainer" />
     </node>
   </node>
-  <node concept="1YbPZF" id="y1G8y66Ejz">
-    <property role="TrG5h" value="typeof_ProjectExpression" />
-    <node concept="3clFbS" id="y1G8y66Ej$" role="18ibNy">
-      <node concept="1Z5TYs" id="hSU_o8Y" role="3cqZAp">
-        <node concept="mw_s8" id="hSU_o8Z" role="1ZfhK$">
-          <node concept="1Z2H0r" id="hSU_o90" role="mwGJk">
-            <node concept="1YBJjd" id="hSU_o91" role="1Z2MuG">
-              <ref role="1YBMHb" node="y1G8y66EjA" resolve="projectExpression" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="hSU_o92" role="1ZfhKB">
-          <node concept="2c44tf" id="hSU_o93" role="mwGJk">
-            <node concept="3uibUv" id="4X4PJUnn4Ut" role="2c44tc">
-              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="y1G8y66EjA" role="1YuTPh">
-      <property role="TrG5h" value="projectExpression" />
-      <ref role="1YaFvo" to="9br2:y1G8y66EiD" resolve="ProjectExpression" />
-    </node>
-  </node>
 </model>