diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index aba8f526..28c97a2d 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -443,7 +443,6 @@
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1181949435690" name="jetbrains.mps.lang.smodel.structure.Concept_NewInstance" flags="nn" index="LFhST" />
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171500988903" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenOperation" flags="nn" index="32TBzR" />
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
@@ -466,13 +465,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -5704,261 +5696,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="1pPth$lC1vN">
-    <property role="2bfB8j" value="false" />
-    <property role="TrG5h" value="HighlightingStep" />
-    <property role="3GE5qa" value="launch.step" />
-    <node concept="2tJIrI" id="52a_GfIQ21d" role="jymVt" />
-    <node concept="3clFbW" id="1pPth$lGTrm" role="jymVt">
-      <node concept="37vLTG" id="1pPth$lGTEd" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="1pPth$lGU5$" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6kREIVkNEO2" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="6kREIVkNFmB" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1pPth$lGTro" role="3clF45" />
-      <node concept="3Tm1VV" id="6kREIVkRzQN" role="1B3o_S" />
-      <node concept="3clFbS" id="1pPth$lGTrq" role="3clF47">
-        <node concept="3clFbF" id="1pPth$lGU8j" role="3cqZAp">
-          <node concept="37vLTI" id="1pPth$lGU8l" role="3clFbG">
-            <node concept="2OqwBi" id="1pPth$lGU8p" role="37vLTJ">
-              <node concept="Xjq3P" id="1pPth$lGU8s" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1pPth$lGU8o" role="2OqNvi">
-                <ref role="2Oxat5" node="1pPth$lGU8f" resolve="editorComponent" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="1pPth$lGU8t" role="37vLTx">
-              <ref role="3cqZAo" node="1pPth$lGTEd" resolve="editorComponent" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6kREIVkNFsh" role="3cqZAp">
-          <node concept="37vLTI" id="6kREIVkNFsj" role="3clFbG">
-            <node concept="2OqwBi" id="6kREIVkNHt8" role="37vLTJ">
-              <node concept="Xjq3P" id="6kREIVkNHHt" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6kREIVkNHtb" role="2OqNvi">
-                <ref role="2Oxat5" node="6kREIVkNFsd" resolve="mpsProject" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="6kREIVkNFsn" role="37vLTx">
-              <ref role="3cqZAo" node="6kREIVkNEO2" resolve="mpsProject" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3F6vMxq_3wR" role="jymVt" />
-    <node concept="3clFb_" id="Hg6EncbkRR" role="jymVt">
-      <property role="TrG5h" value="schedule" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="37vLTG" id="Hg6EncbkRS" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3uibUv" id="Hg6EncbkRT" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="3bpBM3Puk6I" role="11_B2D">
-            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6kREIVkNB3d" role="3clF46">
-        <property role="TrG5h" value="subscribeScheduler" />
-        <node concept="3uibUv" id="6kREIVkNB3e" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="Hg6EncbkRV" role="3clF45">
-        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="3bpBM3Puioq" role="11_B2D">
-          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="Hg6EncFQZO" role="1B3o_S" />
-      <node concept="3clFbS" id="Hg6EncbkS1" role="3clF47">
-        <node concept="3clFbF" id="5lxnBcU04KQ" role="3cqZAp">
-          <node concept="2OqwBi" id="5lxnBcU05yI" role="3clFbG">
-            <node concept="37vLTw" id="5lxnBcU04KO" role="2Oq$k0">
-              <ref role="3cqZAo" node="Hg6EncbkRS" resolve="input" />
-            </node>
-            <node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
-              <node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
-                <node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
-                  <property role="TrG5h" value="inEff" />
-                  <node concept="3uibUv" id="3bpBM3Pupvg" role="1tU5fm">
-                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="5lxnBcU08CQ" role="1bW5cS">
-                  <node concept="3clFbH" id="q1hCixY6_U" role="3cqZAp" />
-                  <node concept="3cpWs8" id="78H58of3fK6" role="3cqZAp">
-                    <node concept="3cpWsn" id="78H58of3fK7" role="3cpWs9">
-                      <property role="TrG5h" value="task" />
-                      <node concept="3uibUv" id="78H58of3fJn" role="1tU5fm">
-                        <ref role="3uigEE" to="o35r:78H58oeT9Hs" resolve="HighlightingTask" />
-                      </node>
-                      <node concept="2ShNRf" id="78H58of3fKb" role="33vP2m">
-                        <node concept="1pGfFk" id="78H58of3fKc" role="2ShVmc">
-                          <ref role="37wK5l" to="o35r:78H58oeTywK" resolve="HighlightingTask" />
-                          <node concept="2OqwBi" id="78H58of3fKd" role="37wK5m">
-                            <node concept="2OqwBi" id="78H58of3fKe" role="2Oq$k0">
-                              <node concept="Xjq3P" id="78H58of3fKf" role="2Oq$k0" />
-                              <node concept="2OwXpG" id="78H58of3fKg" role="2OqNvi">
-                                <ref role="2Oxat5" node="1pPth$lGU8f" resolve="editorComponent" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="78H58of3fKh" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="78H58of3fKi" role="37wK5m">
-                            <node concept="Xjq3P" id="78H58of3fKj" role="2Oq$k0" />
-                            <node concept="2OwXpG" id="78H58of3fKk" role="2OqNvi">
-                              <ref role="2Oxat5" node="1pPth$lGU8f" resolve="editorComponent" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="3CulEO2oFJO" role="3cqZAp">
-                    <node concept="2OqwBi" id="3CulEO2oGCc" role="3clFbG">
-                      <node concept="37vLTw" id="3CulEO2oFJM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
-                      </node>
-                      <node concept="liA8E" id="3CulEO2oHDz" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
-                        <node concept="10M0yZ" id="3CulEO2oIOS" role="37wK5m">
-                          <ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
-                          <ref role="3cqZAo" to="tj24:2daneBP_Jiy" resolve="REPORT_ITEMS" />
-                        </node>
-                        <node concept="1bVj0M" id="3CulEO2oKGB" role="37wK5m">
-                          <node concept="37vLTG" id="3CulEO2oQ3U" role="1bW2Oz">
-                            <property role="TrG5h" value="items" />
-                            <node concept="_YKpA" id="2daneBP_OV2" role="1tU5fm">
-                              <node concept="3uibUv" id="2daneBP_OV3" role="_ZDj9">
-                                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbS" id="3CulEO2oKGD" role="1bW5cS">
-                            <node concept="3clFbF" id="1FOQehx4b_Y" role="3cqZAp">
-                              <node concept="37vLTI" id="1FOQehx4b_Z" role="3clFbG">
-                                <node concept="2OqwBi" id="1FOQehx4bA0" role="37vLTx">
-                                  <node concept="37vLTw" id="1FOQehx4bA1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
-                                  </node>
-                                  <node concept="liA8E" id="1FOQehx4bA2" role="2OqNvi">
-                                    <ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
-                                    <node concept="37vLTw" id="3CulEO2oX65" role="37wK5m">
-                                      <ref role="3cqZAo" node="3CulEO2oQ3U" resolve="items" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="37vLTw" id="1FOQehx4bA6" role="37vLTJ">
-                                  <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbH" id="3CulEO2oUh7" role="3cqZAp" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="78H58of3v9B" role="3cqZAp" />
-                  <node concept="3clFbF" id="5lxnBcU0aba" role="3cqZAp">
-                    <node concept="2OqwBi" id="5lxnBcU0d7B" role="3clFbG">
-                      <node concept="2YIFZM" id="6Yb9hAqxX1a" role="2Oq$k0">
-                        <ref role="37wK5l" to="o35r:78H58of26Si" resolve="scheduleHighlighting" />
-                        <ref role="1Pybhc" to="o35r:41ox5VnpFrR" resolve="HighlightingPlugin" />
-                        <node concept="37vLTw" id="78H58of3wcK" role="37wK5m">
-                          <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
-                        </node>
-                        <node concept="37vLTw" id="78H58of3wcL" role="37wK5m">
-                          <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
-                        </node>
-                        <node concept="37vLTw" id="78H58of3wcM" role="37wK5m">
-                          <ref role="3cqZAo" node="6kREIVkNB3d" resolve="subscribeScheduler" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="5lxnBcU0eq5" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource)" resolve="andThen" />
-                        <node concept="2YIFZM" id="5lxnBcU0gP7" role="37wK5m">
-                          <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
-                          <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
-                          <node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
-                            <node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
-                              <node concept="3clFbH" id="3bpBM3QaoLJ" role="3cqZAp" />
-                              <node concept="3clFbF" id="q1hCixYKM3" role="3cqZAp">
-                                <node concept="2OqwBi" id="q1hCixYLlm" role="3clFbG">
-                                  <node concept="37vLTw" id="q1hCixYKM1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
-                                  </node>
-                                  <node concept="liA8E" id="q1hCixYM6v" role="2OqNvi">
-                                    <ref role="37wK5l" to="1yqb:51ek2rQD9Pw" resolve="compose" />
-                                    <node concept="1bVj0M" id="51ek2rQIyq1" role="37wK5m">
-                                      <node concept="3clFbS" id="51ek2rQIyq3" role="1bW5cS">
-                                        <node concept="3clFbF" id="51ek2rQNLR3" role="3cqZAp">
-                                          <node concept="2YIFZM" id="51ek2rQNMBs" role="3clFbG">
-                                            <ref role="37wK5l" to="1yqb:51ek2rQN_SC" resolve="nullOf" />
-                                            <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                                            <node concept="Xl_RD" id="51ek2rQNNlI" role="37wK5m">
-                                              <property role="Xl_RC" value="highlighting results" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="3bpBM3Qahlw" role="3cqZAp" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="5lxnBcU08SE" role="3cqZAp" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="Hg6EncbkS2" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="Hg6EncbjnH" role="jymVt" />
-    <node concept="3Tm1VV" id="3F6vMxq_2US" role="1B3o_S" />
-    <node concept="3uibUv" id="1pPth$lC2Ed" role="1zkMxy">
-      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-      <node concept="3uibUv" id="7eK3Dxvl0l7" role="11_B2D">
-        <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
-      </node>
-    </node>
-    <node concept="312cEg" id="1pPth$lGU8f" role="jymVt">
-      <property role="TrG5h" value="editorComponent" />
-      <node concept="3Tm6S6" id="1pPth$lGU8g" role="1B3o_S" />
-      <node concept="3uibUv" id="1pPth$lGU8i" role="1tU5fm">
-        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-      </node>
-    </node>
-    <node concept="312cEg" id="6kREIVkNFsd" role="jymVt">
-      <property role="TrG5h" value="mpsProject" />
-      <node concept="3Tm6S6" id="6kREIVkNFse" role="1B3o_S" />
-      <node concept="3uibUv" id="6kREIVkNFsg" role="1tU5fm">
-        <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-      </node>
-    </node>
-  </node>
   <node concept="2uRRBy" id="6TxWhg_AheJ">
     <property role="TrG5h" value="TypecheckingWidgetLifecycle" />
     <node concept="2BZ0e9" id="6TxWhg_BX7s" role="2uRRBA">
@@ -7746,103 +7483,6 @@
               </node>
             </node>
           </node>
-          <node concept="3SKdUt" id="3CulEO1Ljxg" role="3cqZAp">
-            <node concept="1PaTwC" id="3CulEO1Ljxh" role="1aUNEU">
-              <node concept="3oM_SD" id="3CulEO1LkND" role="1PaTwD">
-                <property role="3oM_SC" value="TODO" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkNF" role="1PaTwD">
-                <property role="3oM_SC" value="provide" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkNY" role="1PaTwD">
-                <property role="3oM_SC" value="an" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkO2" role="1PaTwD">
-                <property role="3oM_SC" value="option" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkO7" role="1PaTwD">
-                <property role="3oM_SC" value="to" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkOl" role="1PaTwD">
-                <property role="3oM_SC" value="control" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkO$" role="1PaTwD">
-                <property role="3oM_SC" value="whether" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkOO" role="1PaTwD">
-                <property role="3oM_SC" value="to" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkOX" role="1PaTwD">
-                <property role="3oM_SC" value="show" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkPf" role="1PaTwD">
-                <property role="3oM_SC" value="the" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkPy" role="1PaTwD">
-                <property role="3oM_SC" value="baseline" />
-              </node>
-              <node concept="3oM_SD" id="3CulEO1LkPY" role="1PaTwD">
-                <property role="3oM_SC" value="time" />
-              </node>
-            </node>
-          </node>
-          <node concept="1X3_iC" id="3CulEO1Lg6p" role="lGtFl">
-            <property role="3V$3am" value="statement" />
-            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-            <node concept="3clFbF" id="2U4rQ68z06q" role="8Wnug">
-              <node concept="2OqwBi" id="2U4rQ68z1BS" role="3clFbG">
-                <node concept="37vLTw" id="2U4rQ68z06o" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
-                </node>
-                <node concept="TSZUe" id="2U4rQ68z2Qc" role="2OqNvi">
-                  <node concept="2ShNRf" id="2U4rQ68z2XA" role="25WWJ7">
-                    <node concept="1pGfFk" id="2U4rQ68zt8i" role="2ShVmc">
-                      <ref role="37wK5l" to="tj24:HOeeeUbp1O" resolve="ComputeBaselineTimeStep" />
-                      <node concept="37vLTw" id="2U4rQ68ztjO" role="37wK5m">
-                        <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
-                      </node>
-                      <node concept="2OqwBi" id="2U4rQ68ztqp" role="37wK5m">
-                        <node concept="2OqwBi" id="2U4rQ68ztqq" role="2Oq$k0">
-                          <node concept="37vLTw" id="2U4rQ68ztqr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
-                          </node>
-                          <node concept="1uHKPH" id="2U4rQ68ztqs" role="2OqNvi" />
-                        </node>
-                        <node concept="2Rxl7S" id="2U4rQ68ztqt" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1X3_iC" id="1PN9XOGZQig" role="lGtFl">
-            <property role="3V$3am" value="statement" />
-            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-            <node concept="3clFbF" id="7WKNeR8TcYx" role="8Wnug">
-              <node concept="2OqwBi" id="7WKNeR8TcYy" role="3clFbG">
-                <node concept="37vLTw" id="7WKNeR8TcYz" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
-                </node>
-                <node concept="TSZUe" id="7WKNeR8TcY$" role="2OqNvi">
-                  <node concept="2ShNRf" id="7WKNeR8TcY_" role="25WWJ7">
-                    <node concept="1pGfFk" id="7WKNeR8TcYA" role="2ShVmc">
-                      <ref role="37wK5l" node="1pPth$lGTrm" resolve="HighlightingStep" />
-                      <node concept="37vLTw" id="7WKNeR8TjKr" role="37wK5m">
-                        <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
-                      </node>
-                      <node concept="2OqwBi" id="7WKNeR8TcYC" role="37wK5m">
-                        <node concept="Xjq3P" id="7WKNeR8TcYD" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="7WKNeR8TcYE" role="2OqNvi">
-                          <ref role="2Oxat5" node="6hqFpWnfkNg" resolve="mpsProject" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbH" id="7WKNeR8SQyz" role="3cqZAp" />
           <node concept="3clFbF" id="7WKNeR8SQy$" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8SQy_" 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 08e78cc0..9b3e5c32 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
@@ -5318,179 +5318,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="HOeeeUbosT">
-    <property role="3GE5qa" value="launch.step" />
-    <property role="TrG5h" value="ComputeBaselineTimeStep" />
-    <node concept="2tJIrI" id="HOeeeUboXO" role="jymVt" />
-    <node concept="3clFbW" id="HOeeeUbp1O" role="jymVt">
-      <node concept="37vLTG" id="HOeeeUbtDu" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="HOeeeUbtMp" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="HOeeeUbtPf" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="HOeeeUbtYc" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="HOeeeUbp1Q" role="3clF45" />
-      <node concept="3Tm1VV" id="HOeeeUbp1R" role="1B3o_S" />
-      <node concept="3clFbS" id="HOeeeUbp1S" role="3clF47">
-        <node concept="3clFbF" id="HOeeeUbu1i" role="3cqZAp">
-          <node concept="37vLTI" id="HOeeeUbu1k" role="3clFbG">
-            <node concept="2OqwBi" id="HOeeeUbujE" role="37vLTJ">
-              <node concept="Xjq3P" id="HOeeeUbuoa" role="2Oq$k0" />
-              <node concept="2OwXpG" id="HOeeeUbujH" role="2OqNvi">
-                <ref role="2Oxat5" node="HOeeeUbu1e" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="HOeeeUbu1o" role="37vLTx">
-              <ref role="3cqZAo" node="HOeeeUbtDu" resolve="repository" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="HOeeeUbutB" role="3cqZAp">
-          <node concept="37vLTI" id="HOeeeUbutD" role="3clFbG">
-            <node concept="2OqwBi" id="HOeeeUbuJX" role="37vLTJ">
-              <node concept="Xjq3P" id="HOeeeUbuS_" role="2Oq$k0" />
-              <node concept="2OwXpG" id="HOeeeUbuK0" role="2OqNvi">
-                <ref role="2Oxat5" node="HOeeeUbutz" resolve="node" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="HOeeeUbutH" role="37vLTx">
-              <ref role="3cqZAo" node="HOeeeUbtPf" resolve="node" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="HOeeeUboXT" role="jymVt" />
-    <node concept="3Tm1VV" id="HOeeeUbosU" role="1B3o_S" />
-    <node concept="3uibUv" id="HOeeeUboG4" role="1zkMxy">
-      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-      <node concept="3uibUv" id="HOeeeUbM8D" role="11_B2D">
-        <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-        <node concept="3qTvmN" id="HOeeeUbMK1" role="11_B2D" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="51ek2rQFzTX" role="jymVt">
-      <property role="TrG5h" value="schedule" />
-      <node concept="37vLTG" id="51ek2rQFzTY" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3uibUv" id="51ek2rQFzTZ" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="51ek2rQFzU0" role="11_B2D">
-            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="51ek2rQFzU1" role="3clF46">
-        <property role="TrG5h" value="subscribeScheduler" />
-        <node concept="3uibUv" id="51ek2rQFzU2" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="51ek2rQFzU3" role="3clF45">
-        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="51ek2rQFzU4" role="11_B2D">
-          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="51ek2rQFzU5" role="1B3o_S" />
-      <node concept="3clFbS" id="51ek2rQFzUu" role="3clF47">
-        <node concept="3clFbF" id="51ek2rQHimc" role="3cqZAp">
-          <node concept="1rXfSq" id="51ek2rQHima" role="3clFbG">
-            <ref role="37wK5l" to="1yqb:51ek2rQGEzN" resolve="composeEffect" />
-            <node concept="37vLTw" id="51ek2rQHiJq" role="37wK5m">
-              <ref role="3cqZAo" node="51ek2rQFzTY" resolve="input" />
-            </node>
-            <node concept="1bVj0M" id="51ek2rQFAul" role="37wK5m">
-              <node concept="3clFbS" id="51ek2rQFAum" role="1bW5cS">
-                <node concept="3clFbH" id="51ek2rQFAKk" role="3cqZAp" />
-                <node concept="1QHqEK" id="HOeeeUbvsi" role="3cqZAp">
-                  <node concept="1QHqEC" id="HOeeeUbvsk" role="1QHqEI">
-                    <node concept="3clFbS" id="HOeeeUbvsm" role="1bW5cS">
-                      <node concept="3clFbF" id="HOeeeUbzU4" role="3cqZAp">
-                        <node concept="2OqwBi" id="HOeeeUb$tE" role="3clFbG">
-                          <node concept="2YIFZM" id="HOeeeUb$e9" role="2Oq$k0">
-                            <ref role="37wK5l" to="u78q:~TypeContextManager.getInstance()" resolve="getInstance" />
-                            <ref role="1Pybhc" to="u78q:~TypeContextManager" resolve="TypeContextManager" />
-                          </node>
-                          <node concept="liA8E" id="HOeeeUb$He" role="2OqNvi">
-                            <ref role="37wK5l" to="u78q:~TypeContextManager.runTypeCheckingAction(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.ITypechecking$Action)" resolve="runTypeCheckingAction" />
-                            <node concept="37vLTw" id="HOeeeUb_1L" role="37wK5m">
-                              <ref role="3cqZAo" node="HOeeeUbutz" resolve="node" />
-                            </node>
-                            <node concept="1bVj0M" id="HOeeeUb_po" role="37wK5m">
-                              <node concept="37vLTG" id="HOeeeUbBLc" role="1bW2Oz">
-                                <property role="TrG5h" value="context" />
-                                <node concept="3uibUv" id="HOeeeUbC1b" role="1tU5fm">
-                                  <ref role="3uigEE" to="u78q:~TypeCheckingContext" resolve="TypeCheckingContext" />
-                                </node>
-                              </node>
-                              <node concept="3clFbS" id="HOeeeUb_pq" role="1bW5cS">
-                                <node concept="3clFbH" id="HOeeeUb_zD" role="3cqZAp" />
-                                <node concept="3clFbF" id="HOeeeUbCxC" role="3cqZAp">
-                                  <node concept="2OqwBi" id="HOeeeUbCOt" role="3clFbG">
-                                    <node concept="37vLTw" id="HOeeeUbCxA" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="HOeeeUbBLc" resolve="context" />
-                                    </node>
-                                    <node concept="liA8E" id="HOeeeUbDwZ" role="2OqNvi">
-                                      <ref role="37wK5l" to="u78q:~TypeCheckingContext.checkIfNotChecked(org.jetbrains.mps.openapi.model.SNode,boolean)" resolve="checkIfNotChecked" />
-                                      <node concept="37vLTw" id="HOeeeUbDJH" role="37wK5m">
-                                        <ref role="3cqZAo" node="HOeeeUbutz" resolve="node" />
-                                      </node>
-                                      <node concept="3clFbT" id="HOeeeUbEc5" role="37wK5m">
-                                        <property role="3clFbU" value="false" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbH" id="HOeeeUb_zI" role="3cqZAp" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="HOeeeUbvO$" role="ukAjM">
-                    <ref role="3cqZAo" node="HOeeeUbu1e" resolve="repository" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="51ek2rQNPdU" role="3cqZAp">
-                  <node concept="2YIFZM" id="51ek2rQNPyI" role="3clFbG">
-                    <ref role="37wK5l" to="1yqb:51ek2rQN_SC" resolve="nullOf" />
-                    <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                    <node concept="Xl_RD" id="51ek2rQNPVi" role="37wK5m">
-                      <property role="Xl_RC" value="compute baseline time" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="51ek2rQFAKp" role="3cqZAp" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="51ek2rQFzUv" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="51ek2rQF$kw" role="jymVt" />
-    <node concept="312cEg" id="HOeeeUbu1e" role="jymVt">
-      <property role="TrG5h" value="repository" />
-      <node concept="3Tm6S6" id="HOeeeUbu1f" role="1B3o_S" />
-      <node concept="3uibUv" id="HOeeeUbu1h" role="1tU5fm">
-        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-      </node>
-    </node>
-    <node concept="312cEg" id="HOeeeUbutz" role="jymVt">
-      <property role="TrG5h" value="node" />
-      <node concept="3Tm6S6" id="HOeeeUbut$" role="1B3o_S" />
-      <node concept="3Tqbb2" id="HOeeeUbutA" role="1tU5fm" />
-    </node>
-  </node>
   <node concept="312cEu" id="NKt6yn81z$">
     <property role="3GE5qa" value="launch.step" />
     <property role="TrG5h" value="TypecheckingStep" />