diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
index 20e5f30b..53d1e21a 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
@@ -210,11 +210,6 @@
         <node concept="3Tm1VV" id="2CPBoDC$IAl" role="1B3o_S" />
         <node concept="10P_77" id="2CPBoDC$IAz" role="1tU5fm" />
       </node>
-      <node concept="312cEg" id="2CPBoDC_lPi" role="jymVt">
-        <property role="TrG5h" value="myIsWatching" />
-        <node concept="3Tm1VV" id="2CPBoDC_lPj" role="1B3o_S" />
-        <node concept="10P_77" id="2CPBoDC_lPk" role="1tU5fm" />
-      </node>
       <node concept="312cEg" id="2CPBoDC_pBn" role="jymVt">
         <property role="TrG5h" value="myIsReporting" />
         <node concept="3Tm1VV" id="2CPBoDC_pBo" role="1B3o_S" />
@@ -449,51 +444,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2CPBoDC_l3N" role="jymVt" />
-    <node concept="3clFb_" id="2CPBoDC_kCy" role="jymVt">
-      <property role="TrG5h" value="isWatchingEnabled" />
-      <node concept="10P_77" id="2CPBoDC_kCz" role="3clF45" />
-      <node concept="3Tm1VV" id="2CPBoDC_kC$" role="1B3o_S" />
-      <node concept="3clFbS" id="2CPBoDC_kC_" role="3clF47">
-        <node concept="3clFbF" id="2CPBoDC_kCA" role="3cqZAp">
-          <node concept="2OqwBi" id="2CPBoDC_kCB" role="3clFbG">
-            <node concept="37vLTw" id="2CPBoDC_kCC" role="2Oq$k0">
-              <ref role="3cqZAo" node="2CPBoDC$efo" resolve="myState" />
-            </node>
-            <node concept="2OwXpG" id="2CPBoDC_kCD" role="2OqNvi">
-              <ref role="2Oxat5" node="2CPBoDC_lPi" resolve="myIsWatching" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2CPBoDC_kCx" role="jymVt" />
-    <node concept="3clFb_" id="2CPBoDC_kCl" role="jymVt">
-      <property role="TrG5h" value="setWatchingEnabled" />
-      <node concept="37vLTG" id="2CPBoDC_kCm" role="3clF46">
-        <property role="TrG5h" value="yes" />
-        <node concept="10P_77" id="2CPBoDC_kCn" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="2CPBoDC_kCo" role="3clF45" />
-      <node concept="3Tm1VV" id="2CPBoDC_kCp" role="1B3o_S" />
-      <node concept="3clFbS" id="2CPBoDC_kCq" role="3clF47">
-        <node concept="3clFbF" id="2CPBoDC_kCr" role="3cqZAp">
-          <node concept="37vLTI" id="2CPBoDC_kCs" role="3clFbG">
-            <node concept="37vLTw" id="2CPBoDC_kCt" role="37vLTx">
-              <ref role="3cqZAo" node="2CPBoDC_kCm" resolve="yes" />
-            </node>
-            <node concept="2OqwBi" id="2CPBoDC_kCu" role="37vLTJ">
-              <node concept="37vLTw" id="2CPBoDC_kCv" role="2Oq$k0">
-                <ref role="3cqZAo" node="2CPBoDC$efo" resolve="myState" />
-              </node>
-              <node concept="2OwXpG" id="2CPBoDC_kCw" role="2OqNvi">
-                <ref role="2Oxat5" node="2CPBoDC_lPi" resolve="myIsWatching" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2CPBoDC_o$4" role="jymVt" />
     <node concept="3clFb_" id="2CPBoDC_o9$" role="jymVt">
       <property role="TrG5h" value="isReportingEnabled" />
       <node concept="10P_77" id="2CPBoDC_o9_" role="3clF45" />
@@ -794,29 +744,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="adIlSuFRMv" role="3cqZAp">
-          <node concept="3vZ8r8" id="adIlSuFRMw" role="3clFbG">
-            <node concept="3y3z36" id="adIlSuFRMx" role="37vLTx">
-              <node concept="2OqwBi" id="adIlSuFRMB" role="3uHU7B">
-                <node concept="37vLTw" id="adIlSuFRMC" role="2Oq$k0">
-                  <ref role="3cqZAo" node="adIlSuErp_" resolve="settings" />
-                </node>
-                <node concept="liA8E" id="adIlSuFRMD" role="2OqNvi">
-                  <ref role="37wK5l" node="2CPBoDC_kCy" resolve="isWatchingEnabled" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="adIlSuIeUP" role="3uHU7w">
-                <node concept="Xjq3P" id="adIlSuIeUQ" role="2Oq$k0" />
-                <node concept="liA8E" id="adIlSuIeUR" role="2OqNvi">
-                  <ref role="37wK5l" node="5Qx6_65jSEe" resolve="isWatchingEnabled" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="adIlSuFRME" role="37vLTJ">
-              <ref role="3cqZAo" node="adIlSuEEDS" resolve="modified" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="adIlSuG6cT" role="3cqZAp">
           <node concept="3vZ8r8" id="adIlSuG6cU" role="3clFbG">
             <node concept="3y3z36" id="adIlSuG6cV" role="37vLTx">
@@ -932,22 +859,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="adIlSuJwa$" role="3cqZAp">
-          <node concept="2OqwBi" id="adIlSuJwa_" role="3clFbG">
-            <node concept="37vLTw" id="adIlSuJwaA" role="2Oq$k0">
-              <ref role="3cqZAo" node="adIlSuGLof" resolve="settings" />
-            </node>
-            <node concept="liA8E" id="adIlSuJwaB" role="2OqNvi">
-              <ref role="37wK5l" node="2CPBoDC_kCl" resolve="setWatchingEnabled" />
-              <node concept="2OqwBi" id="adIlSuJwaC" role="37wK5m">
-                <node concept="Xjq3P" id="adIlSuJwaD" role="2Oq$k0" />
-                <node concept="liA8E" id="adIlSuJwaE" role="2OqNvi">
-                  <ref role="37wK5l" node="5Qx6_65jSEe" resolve="isWatchingEnabled" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="adIlSuJJmE" role="3cqZAp">
           <node concept="2OqwBi" id="adIlSuJJmF" role="3clFbG">
             <node concept="37vLTw" id="adIlSuJJmG" role="2Oq$k0">
@@ -1034,22 +945,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="adIlSuKykw" role="3cqZAp">
-          <node concept="2OqwBi" id="adIlSuKykx" role="3clFbG">
-            <node concept="Xjq3P" id="adIlSuL8zz" role="2Oq$k0" />
-            <node concept="liA8E" id="adIlSuKykz" role="2OqNvi">
-              <ref role="37wK5l" node="5Qx6_65k3w9" resolve="setWatchingEnabled" />
-              <node concept="2OqwBi" id="adIlSuKyk$" role="37wK5m">
-                <node concept="37vLTw" id="adIlSuLiGy" role="2Oq$k0">
-                  <ref role="3cqZAo" node="adIlSuKyk0" resolve="settings" />
-                </node>
-                <node concept="liA8E" id="adIlSuKykA" role="2OqNvi">
-                  <ref role="37wK5l" node="2CPBoDC_kCy" resolve="isWatchingEnabled" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="adIlSuKykX" role="3cqZAp">
           <node concept="2OqwBi" id="adIlSuKykY" role="3clFbG">
             <node concept="Xjq3P" id="adIlSuLyni" role="2Oq$k0" />
@@ -1142,24 +1037,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5Qx6_65klcV" role="3cqZAp">
-          <node concept="37vLTI" id="5Qx6_65klcW" role="3clFbG">
-            <node concept="2OqwBi" id="5Qx6_65klcX" role="37vLTJ">
-              <node concept="Xjq3P" id="5Qx6_65klcY" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5Qx6_65kpPv" role="2OqNvi">
-                <ref role="2Oxat5" node="5Qx6_65jMHg" resolve="enableWatchingCheckbox" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="5Qx6_65kld0" role="37vLTx">
-              <node concept="1pGfFk" id="5Qx6_65kld1" role="2ShVmc">
-                <ref role="37wK5l" to="qqrq:~JBCheckBox.&lt;init&gt;(java.lang.String)" resolve="JBCheckBox" />
-                <node concept="Xl_RD" id="5Qx6_65kld2" role="37wK5m">
-                  <property role="Xl_RC" value="Watch model changes and collect updates" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="1z4$59hFKst" role="3cqZAp">
           <node concept="37vLTI" id="1z4$59hFKsu" role="3clFbG">
             <node concept="2OqwBi" id="1z4$59hFKsv" role="37vLTJ">
@@ -1267,19 +1144,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5Qx6_65lIZ0" role="3cqZAp">
-          <node concept="2OqwBi" id="5Qx6_65lLWu" role="3clFbG">
-            <node concept="37vLTw" id="5Qx6_65lIYY" role="2Oq$k0">
-              <ref role="3cqZAo" node="5Qx6_65jMHg" resolve="enableWatchingCheckbox" />
-            </node>
-            <node concept="liA8E" id="5Qx6_65lOFO" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addItemListener(java.awt.event.ItemListener)" resolve="addItemListener" />
-              <node concept="37vLTw" id="1z4$59hFUnd" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59hFUmY" resolve="updater" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="1z4$59hHh1s" role="3cqZAp">
           <node concept="2OqwBi" id="1z4$59hHjBx" role="3clFbG">
             <node concept="37vLTw" id="1z4$59hHh1q" role="2Oq$k0">
@@ -1625,24 +1489,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="1z4$59hKKHj" role="3cqZAp" />
-                <node concept="3clFbF" id="1z4$59hDIuv" role="3cqZAp">
-                  <node concept="2OqwBi" id="1z4$59hDIuw" role="3clFbG">
-                    <node concept="37vLTw" id="1z4$59hL01j" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1z4$59hKKGV" resolve="subpanel" />
-                    </node>
-                    <node concept="liA8E" id="1z4$59hDIuy" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
-                      <node concept="2OqwBi" id="1z4$59hDIuz" role="37wK5m">
-                        <node concept="Xjq3P" id="1z4$59hDIu$" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="1z4$59hDIu_" role="2OqNvi">
-                          <ref role="2Oxat5" node="5Qx6_65jMHg" resolve="enableWatchingCheckbox" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="1z4$59hKKHr" role="3cqZAp" />
                 <node concept="3clFbF" id="1z4$59hKKHs" role="3cqZAp">
                   <node concept="2OqwBi" id="1z4$59hKKHt" role="3clFbG">
                     <node concept="37vLTw" id="1z4$59hLGgx" role="2Oq$k0">
@@ -2198,24 +2044,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="14IknWHqqnx" role="jymVt" />
-    <node concept="3clFb_" id="5Qx6_65jSEe" role="jymVt">
-      <property role="TrG5h" value="isWatchingEnabled" />
-      <node concept="10P_77" id="5Qx6_65jSEf" role="3clF45" />
-      <node concept="3Tm1VV" id="5Qx6_65jSEg" role="1B3o_S" />
-      <node concept="3clFbS" id="5Qx6_65jSEh" role="3clF47">
-        <node concept="3clFbF" id="5Qx6_65jSEi" role="3cqZAp">
-          <node concept="2OqwBi" id="5Qx6_65jSEj" role="3clFbG">
-            <node concept="37vLTw" id="5Qx6_65k34s" role="2Oq$k0">
-              <ref role="3cqZAo" node="5Qx6_65jMHg" resolve="enableWatchingCheckbox" />
-            </node>
-            <node concept="liA8E" id="5Qx6_65jSEl" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5Qx6_65jSEd" role="jymVt" />
     <node concept="3clFb_" id="7iCybvTn3it" role="jymVt">
       <property role="TrG5h" value="isTracingEnabled" />
       <node concept="10P_77" id="7iCybvTn3iu" role="3clF45" />
@@ -2303,39 +2131,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5Qx6_65k3w8" role="jymVt" />
-    <node concept="3clFb_" id="5Qx6_65k3w9" role="jymVt">
-      <property role="TrG5h" value="setWatchingEnabled" />
-      <node concept="37vLTG" id="5Qx6_65k3wa" role="3clF46">
-        <property role="TrG5h" value="yes" />
-        <node concept="10P_77" id="5Qx6_65k3wb" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="5Qx6_65k3wc" role="3clF45" />
-      <node concept="3Tm1VV" id="5Qx6_65k3wd" role="1B3o_S" />
-      <node concept="3clFbS" id="5Qx6_65k3we" role="3clF47">
-        <node concept="3clFbF" id="5Qx6_65k3wf" role="3cqZAp">
-          <node concept="2OqwBi" id="5Qx6_65k3wg" role="3clFbG">
-            <node concept="2OqwBi" id="5Qx6_65k3wh" role="2Oq$k0">
-              <node concept="Xjq3P" id="5Qx6_65k3wi" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5Qx6_65kcoN" role="2OqNvi">
-                <ref role="2Oxat5" node="5Qx6_65jMHg" resolve="enableWatchingCheckbox" />
-              </node>
-            </node>
-            <node concept="liA8E" id="5Qx6_65k3wk" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.setSelected(boolean)" resolve="setSelected" />
-              <node concept="37vLTw" id="5Qx6_65k3wl" role="37wK5m">
-                <ref role="3cqZAo" node="5Qx6_65k3wa" resolve="yes" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5Qx6_65kuJs" role="3cqZAp">
-          <node concept="1rXfSq" id="5Qx6_65kuJt" role="3clFbG">
-            <ref role="37wK5l" node="7iCybvTmrHH" resolve="updateEnabledState" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1JkMMuheNqV" role="jymVt" />
     <node concept="3clFb_" id="1z4$59hG6VL" role="jymVt">
       <property role="TrG5h" value="setReportingEnabled" />
       <node concept="37vLTG" id="1z4$59hG6VM" role="3clF46">
@@ -2425,30 +2220,6 @@
       <node concept="3Tm6S6" id="7iCybvTmrHI" role="1B3o_S" />
       <node concept="3cqZAl" id="7iCybvTmrHJ" role="3clF45" />
       <node concept="3clFbS" id="7iCybvTmrHw" role="3clF47">
-        <node concept="3clFbF" id="5Qx6_65kcAq" role="3cqZAp">
-          <node concept="2OqwBi" id="5Qx6_65kcAr" role="3clFbG">
-            <node concept="2OqwBi" id="5Qx6_65kcAs" role="2Oq$k0">
-              <node concept="Xjq3P" id="5Qx6_65kcAt" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5Qx6_65kgW3" role="2OqNvi">
-                <ref role="2Oxat5" node="5Qx6_65jMHg" resolve="enableWatchingCheckbox" />
-              </node>
-            </node>
-            <node concept="liA8E" id="5Qx6_65kcAv" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.setEnabled(boolean)" resolve="setEnabled" />
-              <node concept="2OqwBi" id="5Qx6_65kcAw" role="37wK5m">
-                <node concept="2OqwBi" id="5Qx6_65kcAx" role="2Oq$k0">
-                  <node concept="Xjq3P" id="5Qx6_65kcAy" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="5Qx6_65kcAz" role="2OqNvi">
-                    <ref role="2Oxat5" node="14pL6xi8ySB" resolve="enableTypecheckingCheckbox" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="5Qx6_65kcA$" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~AbstractButton.isSelected()" resolve="isSelected" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="1z4$59hG2j3" role="3cqZAp">
           <node concept="2OqwBi" id="1z4$59hG2j4" role="3clFbG">
             <node concept="2OqwBi" id="1z4$59hG2j5" role="2Oq$k0">
@@ -2557,13 +2328,6 @@
         <ref role="3uigEE" to="dxuu:~JCheckBox" resolve="JCheckBox" />
       </node>
     </node>
-    <node concept="312cEg" id="5Qx6_65jMHg" role="jymVt">
-      <property role="TrG5h" value="enableWatchingCheckbox" />
-      <node concept="3Tm6S6" id="5Qx6_65jMHh" role="1B3o_S" />
-      <node concept="3uibUv" id="5Qx6_65jMHi" role="1tU5fm">
-        <ref role="3uigEE" to="dxuu:~JCheckBox" resolve="JCheckBox" />
-      </node>
-    </node>
     <node concept="312cEg" id="1z4$59hFD5A" role="jymVt">
       <property role="TrG5h" value="enableReportingCheckbox" />
       <node concept="3Tm6S6" id="1z4$59hFD5B" 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 b6cc1b97..0bb81dc3 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
@@ -4698,27 +4698,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbJ" id="7e$2hwayR6C" role="3cqZAp">
-                    <node concept="3clFbS" id="7e$2hwayR6D" role="3clFbx">
-                      <node concept="3cpWs6" id="7e$2hwayR6E" role="3cqZAp">
-                        <node concept="3clFbT" id="7e$2hwayR6F" role="3cqZAk">
-                          <property role="3clFbU" value="true" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="7e$2hwayR6G" role="3clFbw">
-                      <node concept="10M0yZ" id="3zz62D5cwaI" role="2Oq$k0">
-                        <ref role="3cqZAo" to="tj24:5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                        <ref role="1PxDUh" to="tj24:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                      </node>
-                      <node concept="liA8E" id="7e$2hwayR6I" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                        <node concept="37vLTw" id="7e$2hwayR6J" role="37wK5m">
-                          <ref role="3cqZAo" node="7e$2hwayR6N" resolve="key" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbH" id="7e$2hwayR6K" role="3cqZAp" />
                   <node concept="3clFbF" id="7e$2hwayR6L" role="3cqZAp">
                     <node concept="10Nm6u" id="7e$2hwayR6M" role="3clFbG" />
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 a930aefb..23640d52 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
@@ -1021,53 +1021,6 @@
           <node concept="3clFbH" id="27bTNFfaZ1H" role="3cqZAp" />
           <node concept="3J1_TO" id="7gMIJIxS8Bs" role="3cqZAp">
             <node concept="3clFbS" id="7gMIJIxS8Bu" role="1zxBo7">
-              <node concept="3clFbF" id="1a$$29AvYGM" role="3cqZAp">
-                <node concept="2OqwBi" id="1a$$29AvYN5" role="3clFbG">
-                  <node concept="37vLTw" id="7e$2hwavTaV" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7e$2hwavTaS" resolve="config" />
-                  </node>
-                  <node concept="liA8E" id="1a$$29AvYUx" role="2OqNvi">
-                    <ref role="37wK5l" node="7iCybvTszk9" resolve="registerProvider" />
-                    <node concept="Rm8GO" id="1a$$29AvYXx" role="37wK5m">
-                      <ref role="1Px2BO" node="7iCybvToD3Z" resolve="Level" />
-                      <ref role="Rm8GQ" node="5Ul706LbJYK" resolve="TEST" />
-                    </node>
-                    <node concept="1bVj0M" id="1a$$29Aw4Um" role="37wK5m">
-                      <node concept="3clFbS" id="1a$$29Aw4Uo" role="1bW5cS">
-                        <node concept="3clFbJ" id="1a$$29Aw7dF" role="3cqZAp">
-                          <node concept="3clFbS" id="1a$$29Aw7dG" role="3clFbx">
-                            <node concept="3cpWs6" id="1a$$29Aw7dH" role="3cqZAp">
-                              <node concept="3clFbT" id="61G6TdCBaGi" role="3cqZAk">
-                                <property role="3clFbU" value="true" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="1a$$29Aw7dJ" role="3clFbw">
-                            <node concept="10M0yZ" id="3zz62D5cwaJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                              <ref role="1PxDUh" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                            </node>
-                            <node concept="liA8E" id="1a$$29Aw7dL" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                              <node concept="37vLTw" id="1a$$29Aw7dM" role="37wK5m">
-                                <ref role="3cqZAo" node="1a$$29Aw62z" resolve="key" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="1a$$29Aw7pz" role="3cqZAp">
-                          <node concept="10Nm6u" id="1a$$29Aw7px" role="3clFbG" />
-                        </node>
-                      </node>
-                      <node concept="37vLTG" id="1a$$29Aw62z" role="1bW2Oz">
-                        <property role="TrG5h" value="key" />
-                        <node concept="17QB3L" id="1a$$29Aw691" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="7gMIJIxS8Bt" role="3cqZAp" />
               <node concept="1QHqEK" id="27bTNFfaZ1I" role="3cqZAp">
                 <node concept="1QHqEC" id="27bTNFfaZ1J" role="1QHqEI">
                   <node concept="3clFbS" id="27bTNFfaZ1K" role="1bW5cS">
@@ -17713,22 +17666,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="1RYTbd80CiJ" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd80CiK" role="3cpWs9">
-            <property role="TrG5h" value="watching" />
-            <node concept="3uibUv" id="1RYTbd80CiL" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-            <node concept="2YIFZM" id="MSLbfMDOe1" role="33vP2m">
-              <ref role="37wK5l" node="MSLbfMCPo5" resolve="isWatching" />
-              <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-              <node concept="37vLTw" id="MSLbfMDPFq" role="37wK5m">
-                <ref role="3cqZAo" node="1C_jAsqp06T" resolve="config" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1RYTbd80Cll" role="3cqZAp" />
         <node concept="3cpWs8" id="1RYTbd8sGI2" role="3cqZAp">
           <node concept="3cpWsn" id="1RYTbd8sGI3" role="3cpWs9">
             <property role="TrG5h" value="cache" />
@@ -17779,9 +17716,6 @@
                           <node concept="37vLTw" id="6v6oK26wbR2" role="37wK5m">
                             <ref role="3cqZAo" node="1RYTbd80CiD" resolve="containingRoot" />
                           </node>
-                          <node concept="37vLTw" id="6v6oK26wbR4" role="37wK5m">
-                            <ref role="3cqZAo" node="1RYTbd80CiK" resolve="watching" />
-                          </node>
                           <node concept="37vLTw" id="6v6oK26wbR6" role="37wK5m">
                             <ref role="3cqZAo" node="1RYTbd8sGI9" resolve="updatable" />
                           </node>
@@ -18165,23 +18099,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1RYTbd81$UX" role="3cqZAp" />
-        <node concept="3cpWs8" id="1RYTbd81$UY" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd81$UZ" role="3cpWs9">
-            <property role="TrG5h" value="watching" />
-            <node concept="3uibUv" id="1RYTbd81$V0" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-            <node concept="2YIFZM" id="MSLbfMDTte" role="33vP2m">
-              <ref role="37wK5l" node="MSLbfMCPo5" resolve="isWatching" />
-              <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-              <node concept="37vLTw" id="MSLbfMDUm3" role="37wK5m">
-                <ref role="3cqZAo" node="1C_jAsqp06Y" resolve="config" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1RYTbd81$Xy" role="3cqZAp" />
         <node concept="3cpWs8" id="1RYTbd81$Xz" role="3cqZAp">
           <node concept="3cpWsn" id="1RYTbd81$X$" role="3cpWs9">
             <property role="TrG5h" value="cache" />
@@ -18232,9 +18149,6 @@
                           <node concept="37vLTw" id="6v6oK26EdMm" role="37wK5m">
                             <ref role="3cqZAo" node="1RYTbd81$US" resolve="containingRoot" />
                           </node>
-                          <node concept="37vLTw" id="6v6oK26EdMo" role="37wK5m">
-                            <ref role="3cqZAo" node="1RYTbd81$UZ" resolve="watching" />
-                          </node>
                           <node concept="37vLTw" id="6v6oK26EdMq" role="37wK5m">
                             <ref role="3cqZAo" node="1RYTbd81$XF" resolve="updatable" />
                           </node>
@@ -20549,91 +20463,41 @@
             <node concept="3uibUv" id="6v6oK27vjgN" role="1tU5fm">
               <ref role="3uigEE" node="5Qx6_65Eucp" resolve="TypecheckingStrategy.Caching" />
             </node>
-            <node concept="10Nm6u" id="1JGDidhRqIB" role="33vP2m" />
-          </node>
-        </node>
-        <node concept="3clFbJ" id="6v6oK27vjgV" role="3cqZAp">
-          <node concept="3clFbS" id="6v6oK27vjgW" role="3clFbx">
-            <node concept="3clFbF" id="6v6oK27vjhi" role="3cqZAp">
-              <node concept="37vLTI" id="6v6oK27vjhj" role="3clFbG">
-                <node concept="2ShNRf" id="6v6oK27vjhk" role="37vLTx">
-                  <node concept="1pGfFk" id="6v6oK27vjhl" role="2ShVmc">
-                    <ref role="37wK5l" node="7i3KM7gOYIP" resolve="TypecheckingStrategy.Watching" />
-                    <node concept="Xjq3P" id="6v6oK27wMjt" role="37wK5m" />
-                    <node concept="37vLTw" id="1C_jAsqnlH4" role="37wK5m">
-                      <ref role="3cqZAo" node="1C_jAsqni5z" resolve="repository" />
-                    </node>
-                    <node concept="37vLTw" id="1C_jAsqq1Dk" role="37wK5m">
-                      <ref role="3cqZAo" node="1C_jAsqpZQL" resolve="messageHandler" />
-                    </node>
-                    <node concept="2OqwBi" id="6v6oK27vjhn" role="37wK5m">
-                      <node concept="37vLTw" id="6v6oK27vjho" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6v6oK27vjin" resolve="unit" />
-                      </node>
-                      <node concept="I4A8Y" id="6v6oK27vjhp" role="2OqNvi" />
-                    </node>
-                    <node concept="37vLTw" id="6v6oK27vjhq" role="37wK5m">
-                      <ref role="3cqZAo" node="6v6oK27vjin" resolve="unit" />
-                    </node>
-                    <node concept="37vLTw" id="6v6oK27vjhr" role="37wK5m">
-                      <ref role="3cqZAo" node="6v6oK27vjix" resolve="typeCollector" />
-                    </node>
-                    <node concept="2OqwBi" id="6v6oK27vjhs" role="37wK5m">
-                      <node concept="37vLTw" id="6v6oK27vjht" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6v6oK27vjiv" resolve="updatable" />
-                      </node>
-                      <node concept="liA8E" id="6v6oK27vjhu" role="2OqNvi">
-                        <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                      </node>
-                    </node>
-                  </node>
+            <node concept="2ShNRf" id="628U2saJsWF" role="33vP2m">
+              <node concept="1pGfFk" id="628U2saJsWG" role="2ShVmc">
+                <ref role="37wK5l" node="7i3KM7gOYIP" resolve="Watching" />
+                <node concept="Xjq3P" id="628U2saJsWH" role="37wK5m" />
+                <node concept="37vLTw" id="628U2saJsWI" role="37wK5m">
+                  <ref role="3cqZAo" node="1C_jAsqni5z" resolve="repository" />
                 </node>
-                <node concept="37vLTw" id="6v6oK27vjhv" role="37vLTJ">
-                  <ref role="3cqZAo" node="6v6oK27vjgM" resolve="strategy" />
+                <node concept="37vLTw" id="628U2saJsWJ" role="37wK5m">
+                  <ref role="3cqZAo" node="1C_jAsqpZQL" resolve="messageHandler" />
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1JGDidhRm_w" role="3cqZAp" />
-          </node>
-          <node concept="37vLTw" id="6v6oK27vjhf" role="3clFbw">
-            <ref role="3cqZAo" node="6v6oK27vjir" resolve="watching" />
-          </node>
-          <node concept="9aQIb" id="1JGDidhRmYP" role="9aQIa">
-            <node concept="3clFbS" id="1JGDidhRmYQ" role="9aQI4">
-              <node concept="3clFbF" id="1JGDidhRnrF" role="3cqZAp">
-                <node concept="37vLTI" id="1JGDidhRnrH" role="3clFbG">
-                  <node concept="2ShNRf" id="6v6oK27vjgO" role="37vLTx">
-                    <node concept="1pGfFk" id="6v6oK27vjgP" role="2ShVmc">
-                      <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
-                      <node concept="Xjq3P" id="6v6oK27wMjw" role="37wK5m" />
-                      <node concept="37vLTw" id="1C_jAsqnn8U" role="37wK5m">
-                        <ref role="3cqZAo" node="1C_jAsqni5z" resolve="repository" />
-                      </node>
-                      <node concept="37vLTw" id="1C_jAsqq2h9" role="37wK5m">
-                        <ref role="3cqZAo" node="1C_jAsqpZQL" resolve="messageHandler" />
-                      </node>
-                      <node concept="37vLTw" id="6v6oK27vjgR" role="37wK5m">
-                        <ref role="3cqZAo" node="6v6oK27vjix" resolve="typeCollector" />
-                      </node>
-                      <node concept="2OqwBi" id="6v6oK27vjgS" role="37wK5m">
-                        <node concept="37vLTw" id="6v6oK27vjgT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6v6oK27vjiv" resolve="updatable" />
-                        </node>
-                        <node concept="liA8E" id="6v6oK27vjgU" role="2OqNvi">
-                          <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                        </node>
-                      </node>
-                    </node>
+                <node concept="2OqwBi" id="628U2saJsWK" role="37wK5m">
+                  <node concept="37vLTw" id="628U2saJsWL" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6v6oK27vjin" resolve="unit" />
                   </node>
-                  <node concept="37vLTw" id="1JGDidhRnrL" role="37vLTJ">
-                    <ref role="3cqZAo" node="6v6oK27vjgM" resolve="strategy" />
+                  <node concept="I4A8Y" id="628U2saJsWM" role="2OqNvi" />
+                </node>
+                <node concept="37vLTw" id="628U2saJsWN" role="37wK5m">
+                  <ref role="3cqZAo" node="6v6oK27vjin" resolve="unit" />
+                </node>
+                <node concept="37vLTw" id="628U2saJsWO" role="37wK5m">
+                  <ref role="3cqZAo" node="6v6oK27vjix" resolve="typeCollector" />
+                </node>
+                <node concept="2OqwBi" id="628U2saJsWP" role="37wK5m">
+                  <node concept="37vLTw" id="628U2saJsWQ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6v6oK27vjiv" resolve="updatable" />
+                  </node>
+                  <node concept="liA8E" id="628U2saJsWR" role="2OqNvi">
+                    <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6v6oK27vjhz" role="3cqZAp" />
+        <node concept="3clFbH" id="628U2saJsN3" role="3cqZAp" />
         <node concept="3SKdUt" id="6v6oK27vjh$" role="3cqZAp">
           <node concept="1PaTwC" id="6v6oK27vjh_" role="1aUNEU">
             <node concept="3oM_SD" id="6v6oK27vjhA" role="1PaTwD">
@@ -20748,40 +20612,36 @@
       <node concept="3Tmbuc" id="6v6oK27vji_" role="1B3o_S" />
       <node concept="37vLTG" id="1C_jAsqni5z" role="3clF46">
         <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="1C_jAsqnjdc" role="1tU5fm">
+        <node concept="3uibUv" id="628U2saJvdI" role="1tU5fm">
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
       <node concept="37vLTG" id="1C_jAsqvmX5" role="3clF46">
         <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqvnzq" role="1tU5fm">
+        <node concept="3uibUv" id="628U2saJvdJ" role="1tU5fm">
           <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
         </node>
       </node>
       <node concept="37vLTG" id="1C_jAsqpZQL" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
-        <node concept="3uibUv" id="1C_jAsqq0CL" role="1tU5fm">
+        <node concept="3uibUv" id="628U2saJvdK" role="1tU5fm">
           <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
         </node>
       </node>
       <node concept="37vLTG" id="6v6oK27vjin" role="3clF46">
         <property role="TrG5h" value="unit" />
-        <node concept="3Tqbb2" id="6v6oK27wQ7Y" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="6v6oK27vjir" role="3clF46">
-        <property role="TrG5h" value="watching" />
-        <node concept="10P_77" id="6v6oK27wQ80" role="1tU5fm" />
+        <node concept="3Tqbb2" id="628U2saJvdL" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="6v6oK27vjiv" role="3clF46">
         <property role="TrG5h" value="updatable" />
-        <node concept="3uibUv" id="6v6oK27wQ82" role="1tU5fm">
+        <node concept="3uibUv" id="628U2saJvdM" role="1tU5fm">
           <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
         </node>
       </node>
       <node concept="37vLTG" id="6v6oK27vjix" role="3clF46">
         <property role="TrG5h" value="typeCollector" />
-        <node concept="3uibUv" id="6v6oK27wQ83" role="1tU5fm">
-          <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
+        <node concept="3uibUv" id="628U2saJvdN" role="1tU5fm">
+          <ref role="3uigEE" node="5MNibENhpkH" resolve="TypeCollector" />
         </node>
       </node>
     </node>
@@ -21218,20 +21078,6 @@
         </node>
       </node>
     </node>
-    <node concept="Wx3nA" id="5Qx6_65jytE" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="OPTION_TYPECHECKING_WATCHING" />
-      <node concept="3Tm1VV" id="5Qx6_65jytF" role="1B3o_S" />
-      <node concept="17QB3L" id="5Qx6_65jytG" role="1tU5fm" />
-      <node concept="3cpWs3" id="23Habm5BeJy" role="33vP2m">
-        <node concept="37vLTw" id="23Habm5BfA_" role="3uHU7B">
-          <ref role="3cqZAo" node="7iCybvTzJGv" resolve="PREFIX_TYPECHECKING" />
-        </node>
-        <node concept="Xl_RD" id="5Qx6_65jytH" role="3uHU7w">
-          <property role="Xl_RC" value="watching" />
-        </node>
-      </node>
-    </node>
     <node concept="Wx3nA" id="1z4$59hO85X" role="jymVt">
       <property role="3TUv4t" value="true" />
       <property role="TrG5h" value="OPTION_TYPECHECKING_REPORTING" />
@@ -21323,38 +21169,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="MSLbfMCRlJ" role="jymVt" />
-    <node concept="2YIFZL" id="MSLbfMCPo5" role="jymVt">
-      <property role="TrG5h" value="isWatching" />
-      <node concept="37vLTG" id="MSLbfMCPo6" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="MSLbfMCPo7" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
-      <node concept="10P_77" id="MSLbfMCPo8" role="3clF45" />
-      <node concept="3Tm1VV" id="MSLbfMCPo9" role="1B3o_S" />
-      <node concept="3clFbS" id="MSLbfMCPoa" role="3clF47">
-        <node concept="3clFbF" id="MSLbfMEGpu" role="3cqZAp">
-          <node concept="10QFUN" id="MSLbfMEGpw" role="3clFbG">
-            <node concept="3uibUv" id="MSLbfMEGpx" role="10QFUM">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-            <node concept="2OqwBi" id="MSLbfMEGpy" role="10QFUP">
-              <node concept="37vLTw" id="MSLbfMEGpz" role="2Oq$k0">
-                <ref role="3cqZAo" node="MSLbfMCPo6" resolve="config" />
-              </node>
-              <node concept="liA8E" id="MSLbfMEGp$" role="2OqNvi">
-                <ref role="37wK5l" node="7iCybvToiWV" resolve="getOption" />
-                <node concept="37vLTw" id="MSLbfMEGpB" role="37wK5m">
-                  <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="MSLbfMCUQT" role="jymVt" />
     <node concept="2YIFZL" id="MSLbfMFJZ2" role="jymVt">
       <property role="TrG5h" value="isReporting" />
       <node concept="37vLTG" id="MSLbfMFJZ3" role="3clF46">
@@ -21638,23 +21452,6 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3KbdKl" id="MSLbfMJNtm" role="3KbHQx">
-                          <node concept="37vLTw" id="MSLbfMJNtO" role="3Kbmr1">
-                            <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                          </node>
-                          <node concept="3clFbS" id="MSLbfMJNtn" role="3Kbo56">
-                            <node concept="3cpWs6" id="MSLbfMJO82" role="3cqZAp">
-                              <node concept="2OqwBi" id="MSLbfMJO83" role="3cqZAk">
-                                <node concept="37vLTw" id="MSLbfMJO84" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
-                                </node>
-                                <node concept="liA8E" id="MSLbfMJO85" role="2OqNvi">
-                                  <ref role="37wK5l" to="m7o5:2CPBoDC_kCy" resolve="isWatchingEnabled" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
                         <node concept="3KbdKl" id="MSLbfMJNts" role="3KbHQx">
                           <node concept="37vLTw" id="MSLbfMJNtS" role="3Kbmr1">
                             <ref role="3cqZAo" node="1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
@@ -21793,23 +21590,6 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3KbdKl" id="MSLbfMICV8" role="3KbHQx">
-                          <node concept="37vLTw" id="MSLbfMICV9" role="3Kbmr1">
-                            <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                          </node>
-                          <node concept="3clFbS" id="MSLbfMICVa" role="3Kbo56">
-                            <node concept="3SKdUt" id="MSLbfMIE2g" role="3cqZAp">
-                              <node concept="1PaTwC" id="MSLbfMIE2h" role="1aUNEU">
-                                <node concept="3oM_SD" id="MSLbfMIE2i" role="1PaTwD">
-                                  <property role="3oM_SC" value="fall" />
-                                </node>
-                                <node concept="3oM_SD" id="MSLbfMIE2j" role="1PaTwD">
-                                  <property role="3oM_SC" value="through" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
                         <node concept="3KbdKl" id="MSLbfMIEMO" role="3KbHQx">
                           <node concept="37vLTw" id="MSLbfMIEMP" role="3Kbmr1">
                             <ref role="3cqZAo" node="1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
@@ -21947,23 +21727,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3KbdKl" id="MSLbfMJI6D" role="3KbHQx">
-                      <node concept="37vLTw" id="MSLbfMJI7b" role="3Kbmr1">
-                        <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                      </node>
-                      <node concept="3clFbS" id="MSLbfMJI6E" role="3Kbo56">
-                        <node concept="3SKdUt" id="MSLbfMJI6F" role="3cqZAp">
-                          <node concept="1PaTwC" id="MSLbfMJI6G" role="1aUNEU">
-                            <node concept="3oM_SD" id="MSLbfMJI6H" role="1PaTwD">
-                              <property role="3oM_SC" value="fall" />
-                            </node>
-                            <node concept="3oM_SD" id="MSLbfMJI6I" role="1PaTwD">
-                              <property role="3oM_SC" value="through" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
                     <node concept="3KbdKl" id="MSLbfMJI6J" role="3KbHQx">
                       <node concept="37vLTw" id="MSLbfMJI7f" role="3Kbmr1">
                         <ref role="3cqZAo" node="1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />