diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 4760587e..6df9d8af 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -2234,11 +2234,6 @@
   <node concept="bUwia" id="4vbeH84HZvO">
     <property role="TrG5h" value="constraint" />
     <property role="3GE5qa" value="constraint" />
-    <node concept="2rT7sh" id="RZQG986m0Y" role="2rTMjI">
-      <property role="TrG5h" value="lateExpression_invocationContext" />
-      <ref role="2rTdP9" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
-      <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
-    </node>
     <node concept="3aamgX" id="4sSe4$oM8ea" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
       <node concept="1Koe21" id="4sSe4$oM8eb" role="1lVwrX">
@@ -3741,12 +3736,6 @@
                           <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
                         </node>
                       </node>
-                      <node concept="37vLTG" id="4jcOV4hlqbU" role="3clF46">
-                        <property role="TrG5h" value="_invocationContext" />
-                        <node concept="3uibUv" id="4jcOV4hlqbV" role="1tU5fm">
-                          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
-                        </node>
-                      </node>
                       <node concept="37vLTG" id="1HWyn8juJKI" role="3clF46">
                         <property role="TrG5h" value="args" />
                         <node concept="8X2XB" id="1HWyn8juJKJ" role="1tU5fm">
@@ -3951,12 +3940,6 @@
                           <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
                         </node>
                       </node>
-                      <node concept="37vLTG" id="4jcOV4hlpiM" role="3clF46">
-                        <property role="TrG5h" value="_invocationContext" />
-                        <node concept="3uibUv" id="4jcOV4hlpiN" role="1tU5fm">
-                          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
-                        </node>
-                      </node>
                       <node concept="37vLTG" id="3pMFS1zdixt" role="3clF46">
                         <property role="TrG5h" value="args" />
                         <node concept="8X2XB" id="3pMFS1zdixu" role="1tU5fm">
@@ -12611,15 +12594,6 @@
                       <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
                     </node>
                   </node>
-                  <node concept="37vLTG" id="4jcOV4hliBa" role="3clF46">
-                    <property role="TrG5h" value="_invocationContext" />
-                    <node concept="3uibUv" id="4jcOV4hliCP" role="1tU5fm">
-                      <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
-                    </node>
-                    <node concept="2ZBi8u" id="RZQG986pzJ" role="lGtFl">
-                      <ref role="2rW$FS" node="RZQG986m0Y" resolve="lateExpression_invocationContext" />
-                    </node>
-                  </node>
                   <node concept="37vLTG" id="1HWyn8iTlBr" role="3clF46">
                     <property role="TrG5h" value="args" />
                     <node concept="8X2XB" id="1HWyn8iTlBs" role="1tU5fm">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 85aec734..acb58451 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -5866,9 +5866,6 @@
                                     <node concept="37vLTw" id="4nDRG5zMiOm" role="37wK5m">
                                       <ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
                                     </node>
-                                    <node concept="37vLTw" id="4nDRG5zMiOn" role="37wK5m">
-                                      <ref role="3cqZAo" node="4jcOV4hkQup" resolve="invocationContext" />
-                                    </node>
                                     <node concept="2OqwBi" id="4nDRG5zMiOo" role="37wK5m">
                                       <node concept="37vLTw" id="4nDRG5zMiOp" role="2Oq$k0">
                                         <ref role="3cqZAo" node="5WBVN_M1GEu" resolve="expArgs" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
index a2fa00b0..3d02aa8d 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
@@ -1964,12 +1964,6 @@
           <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
         </node>
       </node>
-      <node concept="37vLTG" id="4jcOV4hliBa" role="3clF46">
-        <property role="TrG5h" value="invocationContext" />
-        <node concept="3uibUv" id="4jcOV4hliCP" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
-        </node>
-      </node>
       <node concept="37vLTG" id="5WBVN_M1BNS" role="3clF46">
         <property role="TrG5h" value="args" />
         <node concept="8X2XB" id="5WBVN_M1BOF" role="1tU5fm">