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 a7c658d7..4760587e 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
@@ -4196,9 +4196,6 @@
                             <node concept="37vLTw" id="3pMFS1zfgvU" role="37wK5m">
                               <ref role="3cqZAo" node="3pMFS1zfb2i" resolve="replacement" />
                             </node>
-                            <node concept="37vLTw" id="3pMFS1zfgYS" role="37wK5m">
-                              <ref role="3cqZAo" node="3pMFS1zdixr" resolve="_logicalContext" />
-                            </node>
                           </node>
                         </node>
                       </node>
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 722434f7..882b115c 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
@@ -4650,12 +4650,6 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
       </node>
-      <node concept="37vLTG" id="3pMFS1zdqnx" role="3clF46">
-        <property role="TrG5h" value="logicalContext" />
-        <node concept="3uibUv" id="3pMFS1zdqny" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-        </node>
-      </node>
       <node concept="3uibUv" id="3pMFS1zdqnz" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
@@ -4873,9 +4867,6 @@
                         <ref role="3cqZAo" node="3pMFS1zdJbw" resolve="replForm" />
                       </node>
                     </node>
-                    <node concept="37vLTw" id="3pMFS1znIGm" role="37wK5m">
-                      <ref role="3cqZAo" node="3pMFS1zdqnx" resolve="logicalContext" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -4963,27 +4954,7 @@
             <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
-        <node concept="37vLTG" id="3pMFS1zdqol" role="3clF46">
-          <property role="TrG5h" value="logicalContext" />
-          <property role="3TUv4t" value="false" />
-          <node concept="3uibUv" id="3pMFS1zdqom" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-          </node>
-        </node>
         <node concept="3clFbS" id="3pMFS1zdqon" role="3clF47">
-          <node concept="3clFbF" id="3pMFS1zdqoo" role="3cqZAp">
-            <node concept="37vLTI" id="3pMFS1zdqop" role="3clFbG">
-              <node concept="2OqwBi" id="3pMFS1zdqoq" role="37vLTJ">
-                <node concept="Xjq3P" id="3pMFS1zdqor" role="2Oq$k0" />
-                <node concept="2OwXpG" id="3pMFS1zdqos" role="2OqNvi">
-                  <ref role="2Oxat5" node="3pMFS1zdqqi" resolve="logicalContext" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="3pMFS1zdqot" role="37vLTx">
-                <ref role="3cqZAo" node="3pMFS1zdqol" resolve="logicalContext" />
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="3pMFS1zdOFe" role="3cqZAp">
             <node concept="37vLTI" id="3pMFS1zdOFg" role="3clFbG">
               <node concept="2OqwBi" id="3pMFS1zdPMQ" role="37vLTJ">
@@ -5261,16 +5232,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="3pMFS1zezGx" role="jymVt" />
-      <node concept="312cEg" id="3pMFS1zdqqi" role="jymVt">
-        <property role="34CwA1" value="false" />
-        <property role="eg7rD" value="false" />
-        <property role="TrG5h" value="logicalContext" />
-        <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="3pMFS1zdqqj" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-        </node>
-        <node concept="3Tm6S6" id="3pMFS1zdqqk" role="1B3o_S" />
-      </node>
       <node concept="312cEg" id="3pMFS1zdOFa" role="jymVt">
         <property role="TrG5h" value="patternForm" />
         <node concept="3Tm6S6" id="3pMFS1zdOFb" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 5956c3b3..b5223438 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -943,9 +943,6 @@
                 <node concept="37vLTw" id="2dF51l158Ln" role="37wK5m">
                   <ref role="3cqZAo" node="3HJTsBn443b" resolve="x" />
                 </node>
-                <node concept="37vLTw" id="2dF51l158Lo" role="37wK5m">
-                  <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                </node>
               </node>
             </node>
           </node>
@@ -1137,9 +1134,6 @@
                 <node concept="37vLTw" id="2dF51l16O3l" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l16O2K" resolve="x" />
                 </node>
-                <node concept="37vLTw" id="2dF51l16O3m" role="37wK5m">
-                  <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                </node>
               </node>
             </node>
           </node>
@@ -1380,9 +1374,6 @@
                 <node concept="37vLTw" id="2dF51l19aE7" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1971a" resolve="repl" />
                 </node>
-                <node concept="37vLTw" id="2dF51l195YO" role="37wK5m">
-                  <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                </node>
               </node>
             </node>
           </node>
@@ -1685,9 +1676,6 @@
                 <node concept="37vLTw" id="2dF51l1cNdL" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1cNd3" resolve="repl" />
                 </node>
-                <node concept="37vLTw" id="2dF51l1cNdM" role="37wK5m">
-                  <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                </node>
               </node>
             </node>
           </node>
@@ -1765,9 +1753,6 @@
                 <node concept="37vLTw" id="2dF51l1dJKc" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1cNd3" resolve="repl" />
                 </node>
-                <node concept="37vLTw" id="2dF51l1dJKd" role="37wK5m">
-                  <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                </node>
               </node>
             </node>
           </node>
@@ -1845,9 +1830,6 @@
                 <node concept="37vLTw" id="2dF51l1d4MS" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1cNd3" resolve="repl" />
                 </node>
-                <node concept="37vLTw" id="2dF51l1d4MT" role="37wK5m">
-                  <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                </node>
               </node>
             </node>
           </node>
@@ -2044,9 +2026,6 @@
                 <node concept="37vLTw" id="2dF51l16Lbf" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l15RNn" resolve="y" />
                 </node>
-                <node concept="37vLTw" id="2dF51l15YMB" role="37wK5m">
-                  <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                </node>
               </node>
             </node>
           </node>
@@ -2279,9 +2258,6 @@
                   <node concept="37vLTw" id="6SwZmzB$ro5" role="37wK5m">
                     <ref role="3cqZAo" node="6SwZmzB$bUK" resolve="Z" />
                   </node>
-                  <node concept="37vLTw" id="6SwZmzB$ro6" role="37wK5m">
-                    <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -2308,9 +2284,6 @@
                   <node concept="37vLTw" id="6SwZmzB$s8u" role="37wK5m">
                     <ref role="3cqZAo" node="6SwZmzB$bUK" resolve="Z" />
                   </node>
-                  <node concept="37vLTw" id="6SwZmzB$s8v" role="37wK5m">
-                    <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -2596,9 +2569,6 @@
                   <node concept="37vLTw" id="6SwZmzBGFvD" role="37wK5m">
                     <ref role="3cqZAo" node="6SwZmzBGFvd" resolve="Z" />
                   </node>
-                  <node concept="37vLTw" id="6SwZmzBGFvE" role="37wK5m">
-                    <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -2625,9 +2595,6 @@
                   <node concept="37vLTw" id="6SwZmzBHlST" role="37wK5m">
                     <ref role="3cqZAo" node="6SwZmzBGFvd" resolve="Z" />
                   </node>
-                  <node concept="37vLTw" id="6SwZmzBHlSU" role="37wK5m">
-                    <ref role="3cqZAo" node="5jCHAT2dJM2" resolve="NO_CONTEXT" />
-                  </node>
                 </node>
               </node>
             </node>