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 7495482d..049856a2 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
@@ -811,11 +811,8 @@
                   <node concept="3clFbS" id="14$_tTx$j9N" role="1wplMD">
                     <node concept="3clFbF" id="14$_tTxAMey" role="3cqZAp">
                       <node concept="2YIFZM" id="6$gg4k_t5t7" role="3clFbG">
-                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
                         <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                        <node concept="37vLTw" id="14$_tTxAP4p" role="37wK5m">
-                          <ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1597,11 +1594,8 @@
                   <node concept="3clFbS" id="6$7vuu2xvux" role="1wplMD">
                     <node concept="3clFbF" id="14$_tTxAR_w" role="3cqZAp">
                       <node concept="2YIFZM" id="6$gg4k_t5t8" role="3clFbG">
-                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
                         <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                        <node concept="37vLTw" id="14$_tTxAR_y" role="37wK5m">
-                          <ref role="3cqZAo" node="14$_tTxzzxH" resolve="modelRepo" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1781,11 +1775,8 @@
                   <node concept="3clFbS" id="3u5wJtbtkW" role="1wplMD">
                     <node concept="3clFbF" id="14$_tTxAQ_B" role="3cqZAp">
                       <node concept="2YIFZM" id="6$gg4k_t5t9" role="3clFbG">
-                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
                         <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                        <node concept="37vLTw" id="14$_tTxAQ_D" role="37wK5m">
-                          <ref role="3cqZAo" node="14$_tTxz_CG" resolve="modelRepo" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -2006,11 +1997,8 @@
                   <node concept="3clFbS" id="3IIf9OA4zNu" role="1wplMD">
                     <node concept="3clFbF" id="3IIf9OA4zNv" role="3cqZAp">
                       <node concept="2YIFZM" id="6$gg4k_t5ta" role="3clFbG">
-                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
                         <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                        <node concept="37vLTw" id="3IIf9OA4zNx" role="37wK5m">
-                          <ref role="3cqZAo" node="3IIf9OA4zMN" resolve="modelRepo" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -2463,11 +2451,8 @@
             <node concept="3clFbS" id="3KwBCAABsCh" role="1wplMD">
               <node concept="3clFbF" id="3KwBCAABxsP" role="3cqZAp">
                 <node concept="2YIFZM" id="6$gg4k_t5tb" role="3clFbG">
-                  <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                  <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
                   <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                  <node concept="37vLTw" id="3KwBCAABxsR" role="37wK5m">
-                    <ref role="3cqZAo" node="3KwBCAABwVU" resolve="modelRepo" />
-                  </node>
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 480568cd..6dfc77fd 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -853,11 +853,8 @@
                   <node concept="3clFbS" id="4pwDyRC1qWk" role="1wplMD">
                     <node concept="3clFbF" id="4pwDyRC1qWl" role="3cqZAp">
                       <node concept="2YIFZM" id="4pwDyRC1qWm" role="3clFbG">
-                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                        <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
                         <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                        <node concept="37vLTw" id="4pwDyRC1qWn" role="37wK5m">
-                          <ref role="3cqZAo" node="4pwDyRC1qV_" resolve="modelRepo" />
-                        </node>
                       </node>
                     </node>
                   </node>