diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index b4591bfb..3671df9a 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -3508,47 +3508,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1z4$59jr4ea" role="jymVt" />
-    <node concept="3clFb_" id="hXo0G7usYF" role="jymVt">
-      <property role="TrG5h" value="markInvalidated" />
-      <node concept="3cqZAl" id="hXo0G7usYH" role="3clF45" />
-      <node concept="3Tmbuc" id="1z4$59jkrqx" role="1B3o_S" />
-      <node concept="3clFbS" id="hXo0G7usYJ" role="3clF47">
-        <node concept="3clFbF" id="hXo0G7uxLd" role="3cqZAp">
-          <node concept="37vLTI" id="hXo0G7uyru" role="3clFbG">
-            <node concept="3clFbT" id="hXo0G7uytF" role="37vLTx">
-              <property role="3clFbU" value="true" />
-            </node>
-            <node concept="2OqwBi" id="hXo0G7uxRW" role="37vLTJ">
-              <node concept="Xjq3P" id="hXo0G7uxLc" role="2Oq$k0" />
-              <node concept="2OwXpG" id="hXo0G7uy3d" role="2OqNvi">
-                <ref role="2Oxat5" node="hXo0G7upjO" resolve="invalidated" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="hXo0G7uyxS" role="lGtFl">
-        <node concept="TZ5HA" id="hXo0G7uyxT" role="TZ5H$">
-          <node concept="1dT_AC" id="hXo0G7uyxU" role="1dT_Ay">
-            <property role="1dT_AB" value="Mark this index as containing invalid data." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="hXo0G7u$aE" role="jymVt" />
-    <node concept="3clFb_" id="hXo0G7uA$G" role="jymVt">
-      <property role="TrG5h" value="isInvalidated" />
-      <node concept="10P_77" id="hXo0G7uC$4" role="3clF45" />
-      <node concept="3Tmbuc" id="1z4$59jkuAv" role="1B3o_S" />
-      <node concept="3clFbS" id="hXo0G7uA$K" role="3clF47">
-        <node concept="3clFbF" id="hXo0G7uH_H" role="3cqZAp">
-          <node concept="37vLTw" id="hXo0G7uH_G" role="3clFbG">
-            <ref role="3cqZAo" node="hXo0G7upjO" resolve="invalidated" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="syqlb1UaRY" role="jymVt" />
     <node concept="3clFb_" id="7gMIJIydDx5" role="jymVt">
       <property role="TrG5h" value="isActive" />
       <node concept="10P_77" id="7gMIJIydJDP" role="3clF45" />
@@ -4720,12 +4679,6 @@
       <node concept="10P_77" id="syqlb1U4dU" role="1tU5fm" />
       <node concept="3clFbT" id="syqlb1U4lL" role="33vP2m" />
     </node>
-    <node concept="312cEg" id="hXo0G7upjO" role="jymVt">
-      <property role="TrG5h" value="invalidated" />
-      <node concept="3Tm6S6" id="hXo0G7upjP" role="1B3o_S" />
-      <node concept="10P_77" id="hXo0G7uqIX" role="1tU5fm" />
-      <node concept="3clFbT" id="hXo0G7uqU9" role="33vP2m" />
-    </node>
     <node concept="312cEg" id="7gMIJIyc8MI" role="jymVt">
       <property role="TrG5h" value="active" />
       <node concept="3Tm6S6" id="7gMIJIyc8MJ" role="1B3o_S" />
@@ -11799,32 +11752,9 @@
       </node>
       <node concept="3Tm1VV" id="5AFANm9Mi2o" role="1B3o_S" />
       <node concept="3clFbS" id="5AFANm9Mi2p" role="3clF47">
-        <node concept="3clFbF" id="5AFANm9Mkaw" role="3cqZAp">
-          <node concept="3K4zz7" id="hXo0G7uKKt" role="3clFbG">
-            <node concept="37vLTw" id="hXo0G7uKQ_" role="3K4E3e">
-              <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-            </node>
-            <node concept="10Nm6u" id="hXo0G7uKUO" role="3K4GZi" />
-            <node concept="1eOMI4" id="hXo0G7uKp2" role="3K4Cdx">
-              <node concept="1Wc70l" id="hXo0G7uJcb" role="1eOMHV">
-                <node concept="3fqX7Q" id="hXo0G7uJyK" role="3uHU7w">
-                  <node concept="2OqwBi" id="hXo0G7uJyM" role="3fr31v">
-                    <node concept="37vLTw" id="hXo0G7uJyN" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-                    </node>
-                    <node concept="liA8E" id="hXo0G7uJyO" role="2OqNvi">
-                      <ref role="37wK5l" node="hXo0G7uA$G" resolve="isInvalidated" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3y3z36" id="hXo0G7uJ12" role="3uHU7B">
-                  <node concept="37vLTw" id="5AFANm9Mkav" role="3uHU7B">
-                    <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-                  </node>
-                  <node concept="10Nm6u" id="hXo0G7uJbe" role="3uHU7w" />
-                </node>
-              </node>
-            </node>
+        <node concept="3clFbF" id="17DrR$SYNQi" role="3cqZAp">
+          <node concept="37vLTw" id="17DrR$SYNQg" role="3clFbG">
+            <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
           </node>
         </node>
       </node>
@@ -12158,34 +12088,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="hXo0G7uKWq" role="jymVt" />
-    <node concept="3clFb_" id="hXo0G7uLQ6" role="jymVt">
-      <property role="TrG5h" value="invalidateCache" />
-      <node concept="3cqZAl" id="hXo0G7uLQ8" role="3clF45" />
-      <node concept="3clFbS" id="hXo0G7uLQ9" role="3clF47">
-        <node concept="3clFbJ" id="hXo0G7uPh7" role="3cqZAp">
-          <node concept="3clFbS" id="hXo0G7uPh8" role="3clFbx">
-            <node concept="3clFbF" id="hXo0G7uPh9" role="3cqZAp">
-              <node concept="2OqwBi" id="hXo0G7uPha" role="3clFbG">
-                <node concept="37vLTw" id="hXo0G7uPhb" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-                </node>
-                <node concept="liA8E" id="hXo0G7uPvh" role="2OqNvi">
-                  <ref role="37wK5l" node="hXo0G7usYF" resolve="markInvalidated" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="hXo0G7uPhj" role="3clFbw">
-            <node concept="10Nm6u" id="hXo0G7uPhk" role="3uHU7w" />
-            <node concept="37vLTw" id="hXo0G7uPhl" role="3uHU7B">
-              <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="61G6TdBXYWT" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="4Z$O9mrQJz2" role="jymVt" />
     <node concept="312cEg" id="4Z$O9mrQJ$h" role="jymVt">
       <property role="TrG5h" value="cache" />
       <node concept="3Tm6S6" id="4Z$O9mrQJ$i" role="1B3o_S" />
@@ -19094,9 +18996,6 @@
             </node>
           </node>
           <node concept="22lmx$" id="2xx8OByuo2s" role="3clFbw">
-            <node concept="37vLTw" id="1z4$59hPhU_" role="3uHU7w">
-              <ref role="3cqZAo" node="1z4$59hPhUx" resolve="hasException" />
-            </node>
             <node concept="1eOMI4" id="17DrR$SR0TU" role="3uHU7B">
               <node concept="1Wc70l" id="17DrR$SR1dd" role="1eOMHV">
                 <node concept="3clFbC" id="2xx8OByu38v" role="3uHU7B">
@@ -19118,6 +19017,9 @@
                 </node>
               </node>
             </node>
+            <node concept="37vLTw" id="1z4$59hPhU_" role="3uHU7w">
+              <ref role="3cqZAo" node="1z4$59hPhUx" resolve="hasException" />
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="2xx8OBy8z_c" role="3cqZAp" />