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 2f8c4873..6f0b2689 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
@@ -37,7 +37,6 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
-    <import index="xnrr" ref="r:4fd33103-fc30-42f4-a8cf-d1e858f21988(jetbrains.mps.lang.coderules.program.analysis)" />
     <import index="7ed7" ref="r:48788b84-8ecd-41f5-ad03-cc8c09b1f186(jetbrains.mps.lang.coderules.analysis)" />
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
     <import index="jpi6" ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)" />
@@ -64,9 +63,6 @@
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1224573963862" name="jetbrains.mps.baseLanguage.structure.EnumValuesExpression" flags="nn" index="uiWXb">
-        <reference id="1224573974191" name="enumClass" index="uiZuM" />
-      </concept>
       <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
         <child id="1239714902950" name="expression" index="2$L3a6" />
       </concept>
@@ -693,15 +689,11 @@
       </concept>
       <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
-        <child id="1205679832066" name="ascending" index="2S7zOq" />
-      </concept>
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
-      <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
@@ -13213,257 +13205,6 @@
       <ref role="2rTdP9" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
     </node>
   </node>
-  <node concept="312cEu" id="7m2UX3UIaN5">
-    <property role="TrG5h" value="PrincipalsAnalysisImpl" />
-    <property role="3GE5qa" value="analysis" />
-    <node concept="2tJIrI" id="7m2UX3UIaQQ" role="jymVt" />
-    <node concept="3clFbW" id="2WtKs4tYohZ" role="jymVt">
-      <node concept="3cqZAl" id="2WtKs4tYoi0" role="3clF45" />
-      <node concept="3Tm1VV" id="2WtKs4tYp6X" role="1B3o_S" />
-      <node concept="3clFbS" id="2WtKs4tYoi2" role="3clF47" />
-      <node concept="2ZBi8u" id="2WtKs4tYoi5" role="lGtFl">
-        <ref role="2rW$FS" node="2WtKs4tYtzV" resolve="basic_analysis_ctor" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2WtKs4tDIIo" role="jymVt" />
-    <node concept="3clFb_" id="1H_6AUSEEjh" role="jymVt">
-      <property role="TrG5h" value="doRun" />
-      <node concept="3Tmbuc" id="1H_6AUSZJQf" role="1B3o_S" />
-      <node concept="3cqZAl" id="1H_6AUSW3kj" role="3clF45" />
-      <node concept="3clFbS" id="1H_6AUSEEjl" role="3clF47">
-        <node concept="9aQIb" id="19q1ULB0Kub" role="3cqZAp">
-          <node concept="3clFbS" id="19q1ULB0Kud" role="9aQI4">
-            <node concept="3clFbF" id="5RMo22OIM4x" role="3cqZAp">
-              <node concept="37vLTI" id="5RMo22OIM4y" role="3clFbG">
-                <node concept="2OqwBi" id="5RMo22OIM4z" role="37vLTJ">
-                  <node concept="Xjq3P" id="5RMo22OIM4$" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="5RMo22OIM4_" role="2OqNvi">
-                    <ref role="2Oxat5" to="xnrr:5tAk4yW3RdU" resolve="ability" />
-                  </node>
-                </node>
-                <node concept="AH0OO" id="5RMo22OINzx" role="37vLTx">
-                  <node concept="uiWXb" id="5RMo22OINt8" role="AHHXb">
-                    <ref role="uiZuM" to="av0y:~IncrementalSpec$Enabled" resolve="IncrementalSpec.Enabled" />
-                  </node>
-                  <node concept="3cmrfG" id="5RMo22OIN$C" role="AHEQo">
-                    <property role="3cmrfH" value="0" />
-                    <node concept="17Uvod" id="5RMo22OIN$D" role="lGtFl">
-                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                      <property role="2qtEX9" value="value" />
-                      <node concept="3zFVjK" id="5RMo22OIN$E" role="3zH0cK">
-                        <node concept="3clFbS" id="5RMo22OIN$F" role="2VODD2">
-                          <node concept="3clFbF" id="5RMo22OIN$G" role="3cqZAp">
-                            <node concept="2OqwBi" id="5RMo22OIN$H" role="3clFbG">
-                              <node concept="2OqwBi" id="5RMo22OIN$I" role="2Oq$k0">
-                                <node concept="2OqwBi" id="5RMo22OIN$J" role="2Oq$k0">
-                                  <node concept="1iwH7S" id="5RMo22OIN$K" role="2Oq$k0" />
-                                  <node concept="1psM6Z" id="5RMo22OIN$L" role="2OqNvi">
-                                    <ref role="1psM6Y" node="19q1ULB0ORc" resolve="genImpl" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="5RMo22OIN$M" role="2OqNvi">
-                                  <ref role="37wK5l" to="7ed7:5RMo22OIec$" resolve="ability" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="5RMo22OIN$N" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Enum.ordinal()" resolve="ordinal" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="42Gb8iaMfiO" role="3cqZAp" />
-            <node concept="3clFbF" id="qg3lpvX0ci" role="3cqZAp">
-              <node concept="2OqwBi" id="qg3lpvX2uF" role="3clFbG">
-                <node concept="2OqwBi" id="qg3lpvX0ck" role="2Oq$k0">
-                  <node concept="Xjq3P" id="qg3lpvX0cl" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="qg3lpvX0Zy" role="2OqNvi">
-                    <ref role="2Oxat5" to="xnrr:6b4eZz$Q4E3" resolve="principalCtrs" />
-                  </node>
-                </node>
-                <node concept="TSZUe" id="qg3lpvX3wt" role="2OqNvi">
-                  <node concept="2ShNRf" id="qg3lpvX8OJ" role="25WWJ7">
-                    <node concept="1pGfFk" id="qg3lpvXeGK" role="2ShVmc">
-                      <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
-                      <node concept="Xl_RD" id="qg3lpvXeKa" role="37wK5m">
-                        <property role="Xl_RC" value="main" />
-                      </node>
-                      <node concept="3cmrfG" id="qg3lpvXeOy" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="qg3lpvX0b8" role="3cqZAp" />
-            <node concept="3clFbF" id="19q1ULB0LBs" role="3cqZAp">
-              <node concept="1WS0z7" id="19q1ULB0LBt" role="lGtFl">
-                <node concept="3JmXsc" id="19q1ULB0LBu" role="3Jn$fo">
-                  <node concept="3clFbS" id="19q1ULB0LBv" role="2VODD2">
-                    <node concept="3clFbF" id="19q1ULB0QgH" role="3cqZAp">
-                      <node concept="2OqwBi" id="5BtuWK5yN82" role="3clFbG">
-                        <node concept="2OqwBi" id="19q1ULB0QFc" role="2Oq$k0">
-                          <node concept="2OqwBi" id="19q1ULB0QrW" role="2Oq$k0">
-                            <node concept="1iwH7S" id="19q1ULB0QgG" role="2Oq$k0" />
-                            <node concept="1psM6Z" id="19q1ULB0Qzr" role="2OqNvi">
-                              <ref role="1psM6Y" node="19q1ULB0ORc" resolve="genImpl" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="19q1ULB0QTw" role="2OqNvi">
-                            <ref role="37wK5l" to="7ed7:19q1ULB0sY2" resolve="getPrincipalCtrs" />
-                          </node>
-                        </node>
-                        <node concept="2S7cBI" id="5BtuWK5yNWR" role="2OqNvi">
-                          <node concept="1bVj0M" id="5BtuWK5yNWT" role="23t8la">
-                            <node concept="3clFbS" id="5BtuWK5yNWU" role="1bW5cS">
-                              <node concept="3clFbF" id="5BtuWK5z0ou" role="3cqZAp">
-                                <node concept="2OqwBi" id="5BtuWK5z0Ge" role="3clFbG">
-                                  <node concept="37vLTw" id="5BtuWK5z0ot" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5BtuWK5yNWV" resolve="it" />
-                                  </node>
-                                  <node concept="3TrcHB" id="5BtuWK5z13S" role="2OqNvi">
-                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="Rh6nW" id="5BtuWK5yNWV" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5BtuWK5yNWW" role="1tU5fm" />
-                            </node>
-                          </node>
-                          <node concept="1nlBCl" id="5BtuWK5yNWX" role="2S7zOq">
-                            <property role="3clFbU" value="true" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="19q1ULB0LB$" role="3clFbG">
-                <node concept="37vLTw" id="19q1ULB0LB_" role="2Oq$k0">
-                  <ref role="3cqZAo" to="xnrr:6b4eZz$Q4E3" resolve="principalCtrs" />
-                </node>
-                <node concept="TSZUe" id="19q1ULB0LBA" role="2OqNvi">
-                  <node concept="10Nm6u" id="19q1ULB0LBB" role="25WWJ7">
-                    <node concept="5jKBG" id="19q1ULB0LBC" role="lGtFl">
-                      <ref role="v9R2y" node="2WtKs4tys2W" resolve="constraint_sym" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="19q1ULB0QZb" role="3cqZAp">
-              <node concept="2OqwBi" id="19q1ULB0QZc" role="3clFbG">
-                <node concept="37vLTw" id="19q1ULB0QZd" role="2Oq$k0">
-                  <ref role="3cqZAo" to="xnrr:6b4eZz$Q4Ea" resolve="principalRulesTags" />
-                </node>
-                <node concept="TSZUe" id="19q1ULB0QZe" role="2OqNvi">
-                  <node concept="Xl_RD" id="1vsv9tPovaU" role="25WWJ7">
-                    <property role="Xl_RC" value="template.name" />
-                    <node concept="17Uvod" id="1vsv9tPovnP" role="lGtFl">
-                      <property role="2qtEX9" value="value" />
-                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                      <node concept="3zFVjK" id="1vsv9tPovnQ" role="3zH0cK">
-                        <node concept="3clFbS" id="1vsv9tPovnR" role="2VODD2">
-                          <node concept="3clFbF" id="1vsv9tPovJW" role="3cqZAp">
-                            <node concept="2OqwBi" id="1vsv9tPovXn" role="3clFbG">
-                              <node concept="30H73N" id="1vsv9tPovJV" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="1vsv9tPowGX" role="2OqNvi">
-                                <ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="templateName" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="19q1ULB0QZh" role="lGtFl">
-                <node concept="3JmXsc" id="19q1ULB0QZi" role="3Jn$fo">
-                  <node concept="3clFbS" id="19q1ULB0QZj" role="2VODD2">
-                    <node concept="3clFbF" id="19q1ULB0QZk" role="3cqZAp">
-                      <node concept="2OqwBi" id="5BtuWK5yE2b" role="3clFbG">
-                        <node concept="2OqwBi" id="19q1ULB0Shd" role="2Oq$k0">
-                          <node concept="2OqwBi" id="19q1ULB0QZl" role="2Oq$k0">
-                            <node concept="1iwH7S" id="19q1ULB0QZm" role="2Oq$k0" />
-                            <node concept="1psM6Z" id="19q1ULB0RSQ" role="2OqNvi">
-                              <ref role="1psM6Y" node="19q1ULB0ORc" resolve="genImpl" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="19q1ULB0SxP" role="2OqNvi">
-                            <ref role="37wK5l" to="7ed7:19q1ULB0x36" resolve="getPrincipalRules" />
-                          </node>
-                        </node>
-                        <node concept="2S7cBI" id="5BtuWK5yEHI" role="2OqNvi">
-                          <node concept="1bVj0M" id="5BtuWK5yEHK" role="23t8la">
-                            <node concept="3clFbS" id="5BtuWK5yEHL" role="1bW5cS">
-                              <node concept="3clFbF" id="5BtuWK5z7aj" role="3cqZAp">
-                                <node concept="2OqwBi" id="5BtuWK5zMfe" role="3clFbG">
-                                  <node concept="37vLTw" id="5BtuWK5zLXe" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5BtuWK5yEHM" resolve="it" />
-                                  </node>
-                                  <node concept="2qgKlT" id="5BtuWK5zMBL" role="2OqNvi">
-                                    <ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="templateName" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="Rh6nW" id="5BtuWK5yEHM" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5BtuWK5yEHN" role="1tU5fm" />
-                            </node>
-                          </node>
-                          <node concept="1nlBCl" id="5BtuWK5yEHO" role="2S7zOq">
-                            <property role="3clFbU" value="true" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1ps_y7" id="19q1ULB0ORb" role="lGtFl">
-            <node concept="1ps_xZ" id="19q1ULB0ORc" role="1ps_xO">
-              <property role="TrG5h" value="genImpl" />
-              <node concept="2jfdEK" id="19q1ULB0ORd" role="1ps_xN">
-                <node concept="3clFbS" id="19q1ULB0ORe" role="2VODD2">
-                  <node concept="3clFbF" id="4e0TwrfEO6b" role="3cqZAp">
-                    <node concept="2YIFZM" id="4e0TwrfEOmg" role="3clFbG">
-                      <ref role="37wK5l" to="7ed7:4e0TwrfEkah" resolve="run" />
-                      <ref role="1Pybhc" to="7ed7:1$LYeHxz7Lh" resolve="PrincipalsAnalysisGenImpl" />
-                      <node concept="2OqwBi" id="4e0TwrfEPfU" role="37wK5m">
-                        <node concept="1iwH7S" id="4e0TwrfEOHL" role="2Oq$k0" />
-                        <node concept="1r8y6K" id="4e0TwrfEPEf" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="1H_6AUSEEjm" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="7m2UX3UIaN6" role="1B3o_S" />
-    <node concept="n94m4" id="7m2UX3UIaN7" role="lGtFl" />
-    <node concept="3uibUv" id="6b4eZz$PpMC" role="1zkMxy">
-      <ref role="3uigEE" to="xnrr:6b4eZz$Pl6e" resolve="PrincipalsAnalysis" />
-    </node>
-  </node>
   <node concept="13MO4I" id="2WtKs4tys2W">
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="constraint_sym" />
@@ -13528,17 +13269,6 @@
       </node>
     </node>
   </node>
-  <node concept="bUwia" id="2WtKs4tYtzN">
-    <property role="TrG5h" value="analyses" />
-    <property role="3GE5qa" value="analysis" />
-    <node concept="2VPoh5" id="2Ap6smxg_A" role="2VS0gm">
-      <ref role="2VPoh2" node="7m2UX3UIaN5" resolve="PrincipalsAnalysisImpl" />
-    </node>
-    <node concept="2rT7sh" id="2WtKs4tYtzV" role="2rTMjI">
-      <property role="TrG5h" value="basic_analysis_ctor" />
-      <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
-    </node>
-  </node>
   <node concept="13MO4I" id="6xVZN2uppfW">
     <property role="TrG5h" value="rule_basename" />
     <ref role="3gUMe" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
@@ -19108,29 +18838,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="5EDW3XF6zXt" role="jymVt" />
-    <node concept="3clFb_" id="5EDW3XF62NQ" role="jymVt">
-      <property role="TrG5h" value="programSpecBuilder" />
-      <node concept="3Tm1VV" id="5EDW3XF62NS" role="1B3o_S" />
-      <node concept="3clFbS" id="5EDW3XF62NU" role="3clF47">
-        <node concept="3clFbF" id="5EDW3XF6$kS" role="3cqZAp">
-          <node concept="2OqwBi" id="5tAk4yVYcSe" role="3clFbG">
-            <node concept="37vLTw" id="5EDW3XF6$kQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="5EDW3XF6d9H" resolve="analyses" />
-            </node>
-            <node concept="liA8E" id="5tAk4yVYdc$" role="2OqNvi">
-              <ref role="37wK5l" to="xnrr:6b4eZz$PC$s" resolve="specBuilder" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5EDW3XF62NV" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="3uibUv" id="5tAk4yVYcvv" role="3clF45">
-        <ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5EDW3XF6frs" role="jymVt" />
     <node concept="3clFb_" id="5EDW3XF6enC" role="jymVt">
       <property role="TrG5h" value="init" />
@@ -19358,62 +19065,6 @@
             </node>
           </node>
         </node>
-        <node concept="9aQIb" id="5EDW3XF6iYq" role="3cqZAp">
-          <node concept="3clFbS" id="5EDW3XF6iYs" role="9aQI4">
-            <node concept="3cpWs8" id="5EDW3XF6ep6" role="3cqZAp">
-              <node concept="3cpWsn" id="5EDW3XF6ep7" role="3cpWs9">
-                <property role="TrG5h" value="builder" />
-                <node concept="3uibUv" id="5EDW3XF6ep8" role="1tU5fm">
-                  <ref role="3uigEE" node="7m2UX3UIaN5" resolve="PrincipalsAnalysisImpl" />
-                </node>
-                <node concept="2ShNRf" id="5EDW3XF6ep9" role="33vP2m">
-                  <node concept="1pGfFk" id="5EDW3XF6epa" role="2ShVmc">
-                    <ref role="37wK5l" node="2WtKs4tYohZ" resolve="PrincipalsAnalysisImpl" />
-                    <node concept="1ZhdrF" id="5EDW3XF6epb" role="lGtFl">
-                      <property role="2qtEX8" value="baseMethodDeclaration" />
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                      <node concept="3$xsQk" id="5EDW3XF6epc" role="3$ytzL">
-                        <node concept="3clFbS" id="5EDW3XF6epd" role="2VODD2">
-                          <node concept="3clFbF" id="5EDW3XF6epe" role="3cqZAp">
-                            <node concept="2OqwBi" id="5EDW3XF6epf" role="3clFbG">
-                              <node concept="1iwH7S" id="5EDW3XF6epg" role="2Oq$k0" />
-                              <node concept="1iwH7d" id="5EDW3XF6eph" role="2OqNvi">
-                                <ref role="1iwH7c" node="2WtKs4tYtzV" resolve="basic_analysis_ctor" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="5tAk4yVYdON" role="3cqZAp">
-              <node concept="2OqwBi" id="5tAk4yVYe6u" role="3clFbG">
-                <node concept="37vLTw" id="5tAk4yVYdOL" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5EDW3XF6ep7" resolve="builder" />
-                </node>
-                <node concept="liA8E" id="5tAk4yVYe7K" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:1H_6AUSXuxC" resolve="run" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="5EDW3XF6epm" role="3cqZAp">
-              <node concept="37vLTI" id="5EDW3XF6epn" role="3clFbG">
-                <node concept="37vLTw" id="5EDW3XF6epo" role="37vLTx">
-                  <ref role="3cqZAo" node="5EDW3XF6ep7" resolve="builder" />
-                </node>
-                <node concept="2OqwBi" id="5EDW3XF6epp" role="37vLTJ">
-                  <node concept="Xjq3P" id="5EDW3XF6epq" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="5EDW3XF6epr" role="2OqNvi">
-                    <ref role="2Oxat5" node="5EDW3XF6d9H" resolve="analyses" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XF6cg_" role="jymVt" />
@@ -19445,13 +19096,6 @@
         </node>
       </node>
     </node>
-    <node concept="312cEg" id="5EDW3XF6d9H" role="jymVt">
-      <property role="TrG5h" value="analyses" />
-      <node concept="3Tm6S6" id="5EDW3XF6d9I" role="1B3o_S" />
-      <node concept="3uibUv" id="5EDW3XF6d9J" role="1tU5fm">
-        <ref role="3uigEE" node="7m2UX3UIaN5" resolve="PrincipalsAnalysisImpl" />
-      </node>
-    </node>
   </node>
   <node concept="bUwia" id="sL9MTQxaqI">
     <property role="3GE5qa" value="aspect" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
index 70214064..33ce107a 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
@@ -27,7 +27,6 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
@@ -35,7 +34,6 @@
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="13" />
-    <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
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 54aec106..a8ecbdd7 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
@@ -27,7 +27,6 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
-    <import index="xnrr" ref="r:4fd33103-fc30-42f4-a8cf-d1e858f21988(jetbrains.mps.lang.coderules.program.analysis)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
@@ -585,12 +584,6 @@
           <ref role="3uigEE" node="3GlpCDSxTG7" resolve="ProgramProducer" />
         </node>
       </node>
-      <node concept="37vLTG" id="5tAk4yVOEzr" role="3clF46">
-        <property role="TrG5h" value="programSpec" />
-        <node concept="3uibUv" id="5tAk4yW2GEb" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-        </node>
-      </node>
       <node concept="37vLTG" id="4J__M6MPY0" role="3clF46">
         <property role="TrG5h" value="sessionToken" />
         <node concept="3uibUv" id="4J__M6MR1t" role="1tU5fm">
@@ -776,25 +769,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="8odmgCo4LW" role="3cqZAp" />
-        <node concept="3clFbF" id="7eQMSyza1JA" role="3cqZAp">
-          <node concept="37vLTI" id="7eQMSyza3Wa" role="3clFbG">
-            <node concept="2OqwBi" id="7eQMSyza54k" role="37vLTx">
-              <node concept="37vLTw" id="7eQMSyza4Y_" role="2Oq$k0">
-                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-              </node>
-              <node concept="liA8E" id="7eQMSyza5cw" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withIncrSpec(jetbrains.mps.logic.reactor.program.IncrementalSpec)" resolve="withIncrSpec" />
-                <node concept="37vLTw" id="5tAk4yVOGST" role="37wK5m">
-                  <ref role="3cqZAo" node="5tAk4yVOEzr" resolve="programSpec" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="7eQMSyza1J$" role="37vLTJ">
-              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="3R7n5gYSM0T" role="3cqZAp">
           <node concept="37vLTI" id="3R7n5gYSM0U" role="3clFbG">
             <node concept="2OqwBi" id="3R7n5gYSM0V" role="37vLTx">
@@ -3471,41 +3445,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="cmlg9ODgY7" role="jymVt" />
-    <node concept="3clFb_" id="2WtKs4tZfgb" role="jymVt">
-      <property role="TrG5h" value="programSpec" />
-      <node concept="3clFbS" id="2WtKs4tZfge" role="3clF47">
-        <node concept="3clFbF" id="2WtKs4tZfSn" role="3cqZAp">
-          <node concept="2OqwBi" id="5tAk4yVYio9" role="3clFbG">
-            <node concept="37vLTw" id="2WtKs4tZfSm" role="2Oq$k0">
-              <ref role="3cqZAo" node="2WtKs4tZfH3" resolve="programSpecBuilder" />
-            </node>
-            <node concept="liA8E" id="5tAk4yVYiyk" role="2OqNvi">
-              <ref role="37wK5l" to="xnrr:5tAk4yVVZZP" resolve="toSpec" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2WtKs4tZf7R" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yW2uCZ" role="3clF45">
-        <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5tAk4yW02_W" role="jymVt" />
-    <node concept="3clFb_" id="5tAk4yW01VJ" role="jymVt">
-      <property role="TrG5h" value="programSpecBuilder" />
-      <node concept="3clFbS" id="5tAk4yW01VK" role="3clF47">
-        <node concept="3clFbF" id="5tAk4yW01VL" role="3cqZAp">
-          <node concept="37vLTw" id="5tAk4yW01VM" role="3clFbG">
-            <ref role="3cqZAo" node="2WtKs4tZfH3" resolve="programSpecBuilder" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5tAk4yW01VN" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yW0d6$" role="3clF45">
-        <ref role="3uigEE" to="xnrr:1H_6AUT30JE" resolve="IncrProgramSpecBuilder" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="72RDgIN45M_" role="jymVt" />
     <node concept="3clFb_" id="7DvO2M9VeMb" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="3Tm6S6" id="7DvO2M9VeMc" role="1B3o_S" />
@@ -3536,19 +3475,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="2WtKs4u1jqB" role="3cqZAp">
-          <node concept="3cpWsn" id="2WtKs4u1jqC" role="3cpWs9">
-            <property role="TrG5h" value="programSpecBuilder" />
-            <node concept="3uibUv" id="5tAk4yVYecF" role="1tU5fm">
-              <ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
-            </node>
-            <node concept="2ShNRf" id="5ka_cIaiJe4" role="33vP2m">
-              <node concept="HV5vD" id="5tAk4yVYgKd" role="2ShVmc">
-                <ref role="HV5vE" to="i348:5tAk4yVYeLR" resolve="ProgramSpecBuilder.Empty" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbH" id="2WtKs4tZiYW" role="3cqZAp" />
         <node concept="2Gpval" id="NKt6yoTa7y" role="3cqZAp">
           <node concept="3clFbS" id="6UWSvq5d00n" role="2LFqv$">
@@ -3580,29 +3506,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="5ka_cIaiKPp" role="3cqZAp">
-              <node concept="37vLTI" id="5ka_cIaiKXo" role="3clFbG">
-                <node concept="2OqwBi" id="5ka_cIaiL5s" role="37vLTx">
-                  <node concept="37vLTw" id="5ka_cIaiKYL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="programSpecBuilder" />
-                  </node>
-                  <node concept="liA8E" id="5ka_cIaiLc5" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5tAk4yVWROP" resolve="merge" />
-                    <node concept="2OqwBi" id="5ka_cIaiLle" role="37wK5m">
-                      <node concept="37vLTw" id="5ka_cIaiLdY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5EDW3XFurcS" resolve="manifest" />
-                      </node>
-                      <node concept="liA8E" id="5ka_cIaiLvS" role="2OqNvi">
-                        <ref role="37wK5l" to="fqlx:2WtKs4tZlCC" resolve="programSpecBuilder" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="5ka_cIaiKPn" role="37vLTJ">
-                  <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="programSpecBuilder" />
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="37vLTw" id="6UWSvq5d00t" role="2GsD0m">
             <ref role="3cqZAo" node="7DvO2M9VeMe" resolve="aspects" />
@@ -3660,26 +3563,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5ka_cIajbyK" role="3cqZAp">
-          <node concept="37vLTI" id="5ka_cIajbXZ" role="3clFbG">
-            <node concept="2OqwBi" id="5ka_cIajbI_" role="37vLTJ">
-              <node concept="Xjq3P" id="5ka_cIajbyI" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5ka_cIajbQ3" role="2OqNvi">
-                <ref role="2Oxat5" node="2WtKs4tZfH3" resolve="programSpecBuilder" />
-              </node>
-            </node>
-            <node concept="1eOMI4" id="5tAk4yW0djk" role="37vLTx">
-              <node concept="10QFUN" id="5tAk4yW0djh" role="1eOMHV">
-                <node concept="3uibUv" id="5tAk4yW0dlJ" role="10QFUM">
-                  <ref role="3uigEE" to="xnrr:1H_6AUT30JE" resolve="IncrProgramSpecBuilder" />
-                </node>
-                <node concept="37vLTw" id="5tAk4yVYi$l" role="10QFUP">
-                  <ref role="3cqZAo" node="2WtKs4u1jqC" resolve="programSpecBuilder" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="1Pi9pJ$aeWZ" role="3cqZAp">
           <node concept="2OqwBi" id="1Pi9pJ$ag5B" role="3clFbG">
             <node concept="2OqwBi" id="1Pi9pJ$afki" role="2Oq$k0">
@@ -3745,13 +3628,6 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
-    <node concept="312cEg" id="2WtKs4tZfH3" role="jymVt">
-      <property role="TrG5h" value="programSpecBuilder" />
-      <node concept="3Tm6S6" id="2WtKs4tZf$D" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yW0dne" role="1tU5fm">
-        <ref role="3uigEE" to="xnrr:1H_6AUT30JE" resolve="IncrProgramSpecBuilder" />
-      </node>
-    </node>
     <node concept="312cEg" id="zL5ZaND_7a" role="jymVt">
       <property role="TrG5h" value="aspectClique" />
       <node concept="3Tm6S6" id="zL5ZaND_7b" role="1B3o_S" />
@@ -7233,12 +7109,6 @@
     <property role="TrG5h" value="PrincipalNodeReportingSupervisor" />
     <node concept="2tJIrI" id="3o9wrC3VMfA" role="jymVt" />
     <node concept="3clFbW" id="3o9wrC3VMfB" role="jymVt">
-      <node concept="37vLTG" id="3o9wrC3W9cf" role="3clF46">
-        <property role="TrG5h" value="ispec" />
-        <node concept="3uibUv" id="5tAk4yW2PuM" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-        </node>
-      </node>
       <node concept="37vLTG" id="6RN9TdHomDE" role="3clF46">
         <property role="TrG5h" value="feedbackConsumer" />
         <node concept="3uibUv" id="6RN9TdHonzQ" role="1tU5fm">
@@ -7248,19 +7118,6 @@
       <node concept="3cqZAl" id="3o9wrC3VMfE" role="3clF45" />
       <node concept="3Tm1VV" id="3o9wrC3VMfF" role="1B3o_S" />
       <node concept="3clFbS" id="3o9wrC3VMfG" role="3clF47">
-        <node concept="3clFbF" id="3o9wrC3W9j0" role="3cqZAp">
-          <node concept="37vLTI" id="3o9wrC3W9j1" role="3clFbG">
-            <node concept="37vLTw" id="3o9wrC3W9j2" role="37vLTx">
-              <ref role="3cqZAo" node="3o9wrC3W9cf" resolve="ispec" />
-            </node>
-            <node concept="2OqwBi" id="3o9wrC3W9j3" role="37vLTJ">
-              <node concept="Xjq3P" id="3o9wrC3W9j4" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3o9wrC3W9j5" role="2OqNvi">
-                <ref role="2Oxat5" node="3o9wrC3VO0X" resolve="ispec" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="6RN9TdHonDD" role="3cqZAp">
           <node concept="37vLTI" id="6RN9TdHooa3" role="3clFbG">
             <node concept="37vLTw" id="6RN9TdHoogy" role="37vLTx">
@@ -7551,29 +7408,16 @@
                 </node>
               </node>
             </node>
-            <node concept="1Wc70l" id="3o9wrC3VMi2" role="3uHU7B">
-              <node concept="2OqwBi" id="3o9wrC3WaRP" role="3uHU7B">
-                <node concept="37vLTw" id="3o9wrC3WaxE" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3o9wrC3VO0X" resolve="ispec" />
-                </node>
-                <node concept="liA8E" id="3o9wrC3Wbds" role="2OqNvi">
-                  <ref role="37wK5l" to="av0y:~IncrementalSpec.isPrincipal(jetbrains.mps.logic.reactor.program.Rule)" resolve="isPrincipal" />
-                  <node concept="37vLTw" id="3o9wrC3Wbi1" role="37wK5m">
-                    <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
-                  </node>
-                </node>
+            <node concept="2ZW3vV" id="1laj_RTZc_6" role="3uHU7B">
+              <node concept="3uibUv" id="1laj_RTZc_7" role="2ZW6by">
+                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
               </node>
-              <node concept="2ZW3vV" id="1laj_RTZc_6" role="3uHU7w">
-                <node concept="3uibUv" id="1laj_RTZc_7" role="2ZW6by">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <node concept="2OqwBi" id="1laj_RTZc_8" role="2ZW6bz">
+                <node concept="37vLTw" id="55xYlrmncVd" role="2Oq$k0">
+                  <ref role="3cqZAo" node="55xYlrmnaoG" resolve="ruleMatch" />
                 </node>
-                <node concept="2OqwBi" id="1laj_RTZc_8" role="2ZW6bz">
-                  <node concept="37vLTw" id="55xYlrmncVd" role="2Oq$k0">
-                    <ref role="3cqZAo" node="55xYlrmnaoG" resolve="ruleMatch" />
-                  </node>
-                  <node concept="liA8E" id="1laj_RTZc_a" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
-                  </node>
+                <node concept="liA8E" id="1laj_RTZc_a" role="2OqNvi">
+                  <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                 </node>
               </node>
             </node>
@@ -7588,13 +7432,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="55xYlrmneZn" role="jymVt" />
-    <node concept="312cEg" id="3o9wrC3VO0X" role="jymVt">
-      <property role="TrG5h" value="ispec" />
-      <node concept="3Tm6S6" id="3o9wrC3VNvy" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yW2PvL" role="1tU5fm">
-        <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-      </node>
-    </node>
     <node concept="312cEg" id="6RN9TdHon5Q" role="jymVt">
       <property role="TrG5h" value="feedbackConsumer" />
       <node concept="3Tm6S6" id="6RN9TdHomTf" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
index 6025861a..1949a7c7 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
@@ -8,6 +8,7 @@
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -24,10 +25,15 @@
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+        <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
       <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
+      <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
+        <reference id="1188214555875" name="key" index="2B6OnR" />
+        <child id="1188214607812" name="value" index="2B70Vg" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -97,7 +103,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
@@ -631,6 +639,15 @@
       <ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
     </node>
     <node concept="3Tm1VV" id="5tAk4yVVZI$" role="1B3o_S" />
+    <node concept="2AHcQZ" id="6AZXE2vtyQu" role="2AJF6D">
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <node concept="2B6LJw" id="6AZXE2vt_K4" role="2B76xF">
+        <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+        <node concept="3clFbT" id="6AZXE2vt_NE" role="2B70Vg">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="1H_6AUT3qmv">
     <property role="TrG5h" value="SimpleSpec" />
@@ -964,6 +981,15 @@
         </node>
       </node>
     </node>
+    <node concept="2AHcQZ" id="6AZXE2vtDU5" role="2AJF6D">
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <node concept="2B6LJw" id="6AZXE2vtEd4" role="2B76xF">
+        <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+        <node concept="3clFbT" id="6AZXE2vtEgv" role="2B70Vg">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="6b4eZz$Pl6e">
     <property role="1sVAO0" value="true" />
@@ -1092,6 +1118,15 @@
     <node concept="3uibUv" id="5tAk4yVY8nR" role="1zkMxy">
       <ref role="3uigEE" to="i348:1H_6AUSXnyk" resolve="ProgramAnalysis" />
     </node>
+    <node concept="2AHcQZ" id="6AZXE2vtCHg" role="2AJF6D">
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <node concept="2B6LJw" id="6AZXE2vtCV4" role="2B76xF">
+        <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+        <node concept="3clFbT" id="6AZXE2vtCWG" role="2B70Vg">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps
index 2d0bd634..05bff872 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps
@@ -18,7 +18,6 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
-    <import index="xnrr" ref="r:4fd33103-fc30-42f4-a8cf-d1e858f21988(jetbrains.mps.lang.coderules.program.analysis)" />
     <import index="ogv8" ref="r:c0702ee3-be79-48ac-aa39-b7cd0d895de6(jetbrains.mps.lang.coderules.generator.template.main@generator)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 07b7e4a1..fa94501e 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -43,7 +43,6 @@
     <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
     <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" />
     <import index="ggp6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.lang.pattern.util(MPS.Core/)" />
-    <import index="xnrr" ref="r:4fd33103-fc30-42f4-a8cf-d1e858f21988(jetbrains.mps.lang.coderules.program.analysis)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1057,41 +1056,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5tAk4yVPpUQ" role="3cqZAp">
-          <node concept="37vLTI" id="5tAk4yVPr1B" role="3clFbG">
-            <node concept="2OqwBi" id="6VRLMeOw3ff" role="37vLTx">
-              <node concept="2OqwBi" id="5SC$dmoHFki" role="2Oq$k0">
-                <node concept="2OqwBi" id="6VRLMeOvQoN" role="2Oq$k0">
-                  <node concept="2OqwBi" id="5tAk4yVPrzY" role="2Oq$k0">
-                    <node concept="37vLTw" id="1Pi9pJ$htX9" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
-                    </node>
-                    <node concept="liA8E" id="6VRLMeOvQgH" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:5tAk4yW01VJ" resolve="programSpecBuilder" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="6VRLMeOvQBE" role="2OqNvi">
-                    <ref role="37wK5l" to="xnrr:57Rdq$NuMzc" resolve="setLevel" />
-                    <node concept="10Nm6u" id="6DQTzHz0dSk" role="37wK5m" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="5SC$dmoHGmk" role="2OqNvi">
-                  <ref role="37wK5l" to="xnrr:5tAk4yVVXiF" resolve="assertingContracts" />
-                  <node concept="3clFbT" id="5SC$dmoHGAz" role="37wK5m" />
-                </node>
-              </node>
-              <node concept="liA8E" id="5SC$dmoHGIw" role="2OqNvi">
-                <ref role="37wK5l" to="xnrr:5tAk4yVVZZP" resolve="toSpec" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="5tAk4yVPql3" role="37vLTJ">
-              <node concept="Xjq3P" id="5tAk4yVPpUO" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5tAk4yVPqFD" role="2OqNvi">
-                <ref role="2Oxat5" node="5tAk4yVPcZJ" resolve="progSpec" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="tyIfzC1OO3" role="3cqZAp">
           <node concept="37vLTI" id="tyIfzC1PST" role="3clFbG">
             <node concept="2OqwBi" id="tyIfzC1P5D" role="37vLTJ">
@@ -1795,9 +1759,6 @@
             <node concept="2ShNRf" id="3o9wrC3WGRN" role="33vP2m">
               <node concept="1pGfFk" id="5rVYEA66sG1" role="2ShVmc">
                 <ref role="37wK5l" to="hano:3o9wrC3VMfB" resolve="PrincipalNodeReportingSupervisor" />
-                <node concept="37vLTw" id="5tAk4yVPfYq" role="37wK5m">
-                  <ref role="3cqZAo" node="5tAk4yVPcZJ" resolve="progSpec" />
-                </node>
                 <node concept="37vLTw" id="WJTIIp8IAA" role="37wK5m">
                   <ref role="3cqZAo" node="WJTIIp8A0t" resolve="failuresSink" />
                 </node>
@@ -1828,9 +1789,6 @@
                     <node concept="37vLTw" id="3o9wrC3u78G" role="37wK5m">
                       <ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
                     </node>
-                    <node concept="37vLTw" id="5tAk4yVPgxV" role="37wK5m">
-                      <ref role="3cqZAo" node="5tAk4yVPcZJ" resolve="progSpec" />
-                    </node>
                     <node concept="10Nm6u" id="6DQTzHxvFDr" role="37wK5m" />
                     <node concept="37vLTw" id="6fTgyZtNj3o" role="37wK5m">
                       <ref role="3cqZAo" node="3o9wrC3WGRL" resolve="supervisor" />
@@ -2731,21 +2689,6 @@
         <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
     </node>
-    <node concept="2tJIrI" id="55idZnEz24A" role="jymVt" />
-    <node concept="3clFb_" id="4VntlICnjoD" role="jymVt">
-      <property role="TrG5h" value="getProgramSpec" />
-      <node concept="3clFbS" id="4VntlICnjoG" role="3clF47">
-        <node concept="3clFbF" id="4VntlICnlgK" role="3cqZAp">
-          <node concept="37vLTw" id="5tAk4yVPpgW" role="3clFbG">
-            <ref role="3cqZAo" node="5tAk4yVPcZJ" resolve="progSpec" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4VntlICnhSq" role="1B3o_S" />
-      <node concept="3uibUv" id="scOg5x8Fz5" role="3clF45">
-        <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="6KCGZaSx62j" role="jymVt" />
     <node concept="312cEg" id="5fMWD6Iop7s" role="jymVt">
       <property role="TrG5h" value="typeCollector" />
@@ -2797,17 +2740,6 @@
         <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
     </node>
-    <node concept="312cEg" id="5tAk4yVPcZJ" role="jymVt">
-      <property role="TrG5h" value="progSpec" />
-      <node concept="3Tm6S6" id="5tAk4yVPb4N" role="1B3o_S" />
-      <node concept="3uibUv" id="scOg5x8Hkr" role="1tU5fm">
-        <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-      </node>
-      <node concept="10M0yZ" id="scOg5x8HIV" role="33vP2m">
-        <ref role="3cqZAo" to="av0y:~IncrementalSpec.DefaultSpec" resolve="DefaultSpec" />
-        <ref role="1PxDUh" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-      </node>
-    </node>
     <node concept="312cEg" id="4J__M6YZRN" role="jymVt">
       <property role="TrG5h" value="sessionToken" />
       <node concept="3Tm6S6" id="4J__M6YZRO" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
index f394b572..eddfca2e 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
@@ -57,10 +57,6 @@
       <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -91,13 +87,11 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -113,9 +107,6 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -172,9 +163,6 @@
       </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
-      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
-        <reference id="7256306938026143658" name="target" index="2aWVGs" />
-      </concept>
       <concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
         <property id="1863527487546097494" name="modelId" index="1XweGQ" />
         <child id="679099339649067980" name="name" index="1j$8Uc" />
@@ -211,18 +199,12 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
-        <child id="7400021826774799510" name="ref" index="2tJFKM" />
-      </concept>
       <concept id="4065387505485742666" name="jetbrains.mps.lang.smodel.structure.ModelPointer_ResolveOperation" flags="ng" index="2yCiCJ" />
       <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
         <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
       </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
-      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -386,356 +368,6 @@
   <node concept="2XOHcx" id="tyIfzBA53c">
     <property role="2XOHcw" value="${coderules_home}" />
   </node>
-  <node concept="1lH9Xt" id="tyIfzBA5cK">
-    <property role="TrG5h" value="Analyses" />
-    <property role="3OwPAg" value="true" />
-    <node concept="2XrIbr" id="2PLbMk5R0rZ" role="1qtyYc">
-      <property role="TrG5h" value="ctr" />
-      <node concept="37vLTG" id="2PLbMk5R0uz" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="2PLbMk5R0v0" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2PLbMk5R0vk" role="3clF46">
-        <property role="TrG5h" value="arity" />
-        <node concept="10Oyi0" id="2PLbMk5R0vP" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="2PLbMk5R0tG" role="3clF45">
-        <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
-      </node>
-      <node concept="3clFbS" id="2PLbMk5R0s1" role="3clF47">
-        <node concept="3clFbF" id="2PLbMk5R0xR" role="3cqZAp">
-          <node concept="2OqwBi" id="2PLbMk5R0gI" role="3clFbG">
-            <node concept="2ShNRf" id="2PLbMk5QY2H" role="2Oq$k0">
-              <node concept="1pGfFk" id="2PLbMk5QZX8" role="2ShVmc">
-                <ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
-                <node concept="2YIFZM" id="2PLbMk5R01n" role="37wK5m">
-                  <ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-                  <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int)" resolve="symbol" />
-                  <node concept="37vLTw" id="2PLbMk5RnWK" role="37wK5m">
-                    <ref role="3cqZAo" node="2PLbMk5R0uz" resolve="name" />
-                  </node>
-                  <node concept="37vLTw" id="2PLbMk5Ro0g" role="37wK5m">
-                    <ref role="3cqZAo" node="2PLbMk5R0vk" resolve="arity" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="2PLbMk5R0pP" role="2OqNvi">
-              <ref role="37wK5l" to="i348:4sSe4$oM2zI" resolve="toConstraint" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="2PLbMk5R0zx" role="1B3o_S" />
-    </node>
-    <node concept="1X3_iC" id="4LE1vMPguHC" role="lGtFl">
-      <property role="3V$3am" value="testMethods" />
-      <property role="3V$3ak" value="8585453e-6bfb-4d80-98de-b16074f1d86c/1216913645126/1217501895093" />
-      <node concept="1LZb2c" id="tyIfzBA5cL" role="8Wnug">
-        <property role="TrG5h" value="basicPrincipalConstraintsAnalysis" />
-        <node concept="3uibUv" id="tyIfzBA5cM" role="Sfmx6">
-          <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-        </node>
-        <node concept="3cqZAl" id="tyIfzBA5cN" role="3clF45" />
-        <node concept="3clFbS" id="tyIfzBA5cO" role="3clF47">
-          <node concept="3clFbH" id="tyIfzBPkAU" role="3cqZAp" />
-          <node concept="3cpWs8" id="4VntlICnIHB" role="3cqZAp">
-            <node concept="3cpWsn" id="4VntlICnIHC" role="3cpWs9">
-              <property role="TrG5h" value="spec" />
-              <node concept="3uibUv" id="scOg5xjfow" role="1tU5fm">
-                <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-              </node>
-            </node>
-          </node>
-          <node concept="1QHqEK" id="tyIfzBIkFO" role="3cqZAp">
-            <node concept="1QHqEC" id="tyIfzBIkFP" role="1QHqEI">
-              <node concept="3clFbS" id="tyIfzBIkFQ" role="1bW5cS">
-                <node concept="3cpWs8" id="tyIfzC3L69" role="3cqZAp">
-                  <node concept="3cpWsn" id="tyIfzC3L6a" role="3cpWs9">
-                    <property role="TrG5h" value="repo" />
-                    <property role="3TUv4t" value="true" />
-                    <node concept="3uibUv" id="tyIfzC3L6b" role="1tU5fm">
-                      <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-                    </node>
-                    <node concept="2OqwBi" id="tyIfzC3L6c" role="33vP2m">
-                      <node concept="1jxXqW" id="tyIfzC3L6d" role="2Oq$k0" />
-                      <node concept="liA8E" id="tyIfzC3L6e" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="tyIfzC3L6f" role="3cqZAp">
-                  <node concept="3cpWsn" id="tyIfzC3L6g" role="3cpWs9">
-                    <property role="TrG5h" value="demo" />
-                    <node concept="3Tqbb2" id="tyIfzC3L6h" role="1tU5fm">
-                      <ref role="ehGHo" to="qulx:7lt0LtPHOlU" resolve="Root" />
-                    </node>
-                    <node concept="2OqwBi" id="tyIfzC3L6i" role="33vP2m">
-                      <node concept="2tJFMh" id="tyIfzC3L6j" role="2Oq$k0">
-                        <node concept="ZC_QK" id="tyIfzC3L6k" role="2tJFKM">
-                          <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
-                        </node>
-                      </node>
-                      <node concept="Vyspw" id="tyIfzC3L6l" role="2OqNvi">
-                        <node concept="37vLTw" id="tyIfzC3L6m" role="Vysub">
-                          <ref role="3cqZAo" node="tyIfzC3L6a" resolve="repo" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="2Y70AYEcpao" role="3cqZAp" />
-                <node concept="3cpWs8" id="tyIfzC3OTB" role="3cqZAp">
-                  <node concept="3cpWsn" id="tyIfzC3OTC" role="3cpWs9">
-                    <property role="TrG5h" value="launcher" />
-                    <node concept="3uibUv" id="tyIfzC3OTD" role="1tU5fm">
-                      <ref role="3uigEE" to="hmoe:tyIfzC0ZNj" resolve="IncrementalLauncher" />
-                    </node>
-                    <node concept="2ShNRf" id="tyIfzC3Sr4" role="33vP2m">
-                      <node concept="1pGfFk" id="tyIfzC3Sr3" role="2ShVmc">
-                        <ref role="37wK5l" to="hmoe:WJTIIoUgQU" resolve="CollectingIncrementalLauncher" />
-                        <node concept="37vLTw" id="tyIfzC3W$o" role="37wK5m">
-                          <ref role="3cqZAo" node="tyIfzC3L6a" resolve="repo" />
-                        </node>
-                        <node concept="2OqwBi" id="tyIfzC40lo" role="37wK5m">
-                          <node concept="37vLTw" id="tyIfzC405c" role="2Oq$k0">
-                            <ref role="3cqZAo" node="tyIfzC3L6g" resolve="demo" />
-                          </node>
-                          <node concept="I4A8Y" id="tyIfzC40_M" role="2OqNvi" />
-                        </node>
-                        <node concept="2OqwBi" id="1XKnVQyDWb" role="37wK5m">
-                          <node concept="37vLTw" id="1XKnVQdS8f" role="2Oq$k0">
-                            <ref role="3cqZAo" node="tyIfzC3L6g" resolve="demo" />
-                          </node>
-                          <node concept="2Rxl7S" id="1XKnVQyFn0" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="tyIfzC3Hzk" role="3cqZAp" />
-                <node concept="3cpWs8" id="tyIfzC4r6g" role="3cqZAp">
-                  <node concept="3cpWsn" id="tyIfzC4r6h" role="3cpWs9">
-                    <property role="TrG5h" value="res" />
-                    <node concept="3uibUv" id="tyIfzC4r6i" role="1tU5fm">
-                      <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
-                    </node>
-                    <node concept="2OqwBi" id="tyIfzC4uHe" role="33vP2m">
-                      <node concept="37vLTw" id="tyIfzC4uuB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="tyIfzC3OTC" resolve="launcher" />
-                      </node>
-                      <node concept="liA8E" id="tyIfzC4y1T" role="2OqNvi">
-                        <ref role="37wK5l" to="hmoe:tyIfzC3x3f" resolve="produceProgram" />
-                        <node concept="2ShNRf" id="3j46jeGDMzS" role="37wK5m">
-                          <node concept="2HTt$P" id="3j46jeGDOff" role="2ShVmc">
-                            <node concept="3Tqbb2" id="3j46jeGDOmu" role="2HTBi0" />
-                            <node concept="37vLTw" id="3j46jeGDOqh" role="2HTEbv">
-                              <ref role="3cqZAo" node="tyIfzC3L6g" resolve="demo" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="3j46jeGQWxf" role="37wK5m">
-                          <node concept="37vLTw" id="3j46jeGQWoa" role="2Oq$k0">
-                            <ref role="3cqZAo" node="tyIfzC3OTC" resolve="launcher" />
-                          </node>
-                          <node concept="liA8E" id="3j46jeGQWI$" role="2OqNvi">
-                            <ref role="37wK5l" to="hmoe:3j46jeGMWII" resolve="getCheckQuery" />
-                          </node>
-                        </node>
-                        <node concept="3clFbT" id="6DQTzHxzFny" role="37wK5m">
-                          <property role="3clFbU" value="true" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3vwNmj" id="tyIfzBIV7r" role="3cqZAp">
-                  <node concept="2OqwBi" id="tyIfzBIVFd" role="3vwVQn">
-                    <node concept="37vLTw" id="tyIfzC4AF8" role="2Oq$k0">
-                      <ref role="3cqZAo" node="tyIfzC4r6h" resolve="res" />
-                    </node>
-                    <node concept="liA8E" id="tyIfzBIVZ3" role="2OqNvi">
-                      <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="4VntlICnIU5" role="3cqZAp">
-                  <node concept="37vLTI" id="4VntlICnJ3r" role="3clFbG">
-                    <node concept="2OqwBi" id="4VntlICnLoq" role="37vLTx">
-                      <node concept="37vLTw" id="4VntlICnLdD" role="2Oq$k0">
-                        <ref role="3cqZAo" node="tyIfzC3OTC" resolve="launcher" />
-                      </node>
-                      <node concept="liA8E" id="4VntlICnMya" role="2OqNvi">
-                        <ref role="37wK5l" to="hmoe:4VntlICnjoD" resolve="getProgramSpec" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="4VntlICnIU3" role="37vLTJ">
-                      <ref role="3cqZAo" node="4VntlICnIHC" resolve="spec" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="tyIfzBIkGT" role="ukAjM">
-              <node concept="1jxXqW" id="tyIfzBIkGU" role="2Oq$k0" />
-              <node concept="liA8E" id="tyIfzBIkGV" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="tyIfzBL6FW" role="3cqZAp" />
-          <node concept="3vwNmj" id="2PLbMk5QW18" role="3cqZAp">
-            <node concept="2OqwBi" id="2PLbMk5QW9O" role="3vwVQn">
-              <node concept="37vLTw" id="2PLbMk5QW4C" role="2Oq$k0">
-                <ref role="3cqZAo" node="4VntlICnIHC" resolve="spec" />
-              </node>
-              <node concept="liA8E" id="2PLbMk5QWU3" role="2OqNvi">
-                <ref role="37wK5l" to="av0y:~IncrementalSpec.isPrincipal(jetbrains.mps.logic.reactor.program.Constraint)" resolve="isPrincipal" />
-                <node concept="2OqwBi" id="2PLbMk5R0AT" role="37wK5m">
-                  <node concept="2WthIp" id="2PLbMk5R0AW" role="2Oq$k0" />
-                  <node concept="2XshWL" id="2PLbMk5R0AY" role="2OqNvi">
-                    <ref role="2WH_rO" node="2PLbMk5R0rZ" resolve="ctr" />
-                    <node concept="Xl_RD" id="2PLbMk5R0CH" role="2XxRq1">
-                      <property role="Xl_RC" value="typeof" />
-                    </node>
-                    <node concept="3cmrfG" id="2PLbMk5R0Pp" role="2XxRq1">
-                      <property role="3cmrfH" value="2" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3SKdUt" id="2PLbMk5R1IT" role="3cqZAp">
-            <node concept="1PaTwC" id="2PLbMk5R1IU" role="1aUNEU">
-              <node concept="3oM_SD" id="2PLbMk5R1IV" role="1PaTwD">
-                <property role="3oM_SC" value="constraints" />
-              </node>
-              <node concept="3oM_SD" id="2PLbMk5R1IW" role="1PaTwD">
-                <property role="3oM_SC" value="from" />
-              </node>
-              <node concept="3oM_SD" id="2PLbMk5R1IX" role="1PaTwD">
-                <property role="3oM_SC" value="queries" />
-              </node>
-              <node concept="3oM_SD" id="2PLbMk5R1IY" role="1PaTwD">
-                <property role="3oM_SC" value="are" />
-              </node>
-              <node concept="3oM_SD" id="2PLbMk5R1IZ" role="1PaTwD">
-                <property role="3oM_SC" value="principal" />
-              </node>
-              <node concept="3oM_SD" id="2PLbMk5R1J0" role="1PaTwD">
-                <property role="3oM_SC" value="too" />
-              </node>
-            </node>
-          </node>
-          <node concept="3vwNmj" id="2PLbMk5R0Ql" role="3cqZAp">
-            <node concept="2OqwBi" id="2PLbMk5R0Qm" role="3vwVQn">
-              <node concept="37vLTw" id="2PLbMk5R0Qn" role="2Oq$k0">
-                <ref role="3cqZAo" node="4VntlICnIHC" resolve="spec" />
-              </node>
-              <node concept="liA8E" id="2PLbMk5R0Qo" role="2OqNvi">
-                <ref role="37wK5l" to="av0y:~IncrementalSpec.isPrincipal(jetbrains.mps.logic.reactor.program.Constraint)" resolve="isPrincipal" />
-                <node concept="2OqwBi" id="2PLbMk5R0Qp" role="37wK5m">
-                  <node concept="2WthIp" id="2PLbMk5R0Qq" role="2Oq$k0" />
-                  <node concept="2XshWL" id="2PLbMk5R0Qr" role="2OqNvi">
-                    <ref role="2WH_rO" node="2PLbMk5R0rZ" resolve="ctr" />
-                    <node concept="Xl_RD" id="2PLbMk5R0Qs" role="2XxRq1">
-                      <property role="Xl_RC" value="recover" />
-                    </node>
-                    <node concept="3cmrfG" id="6QbNnfq6w$M" role="2XxRq1">
-                      <property role="3cmrfH" value="1" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3SKdUt" id="tyIfzBMK8j" role="3cqZAp">
-            <node concept="1PaTwC" id="tyIfzBMK8k" role="1aUNEU">
-              <node concept="3oM_SD" id="tyIfzBMNoA" role="1PaTwD">
-                <property role="3oM_SC" value="'main'" />
-              </node>
-              <node concept="3oM_SD" id="tyIfzBMNoK" role="1PaTwD">
-                <property role="3oM_SC" value="is" />
-              </node>
-              <node concept="3oM_SD" id="tyIfzBMNoN" role="1PaTwD">
-                <property role="3oM_SC" value="always" />
-              </node>
-              <node concept="3oM_SD" id="tyIfzBMQlx" role="1PaTwD">
-                <property role="3oM_SC" value="a" />
-              </node>
-              <node concept="3oM_SD" id="tyIfzBMQlI" role="1PaTwD">
-                <property role="3oM_SC" value="principal" />
-              </node>
-              <node concept="3oM_SD" id="tyIfzBMQlW" role="1PaTwD">
-                <property role="3oM_SC" value="constraint" />
-              </node>
-            </node>
-          </node>
-          <node concept="1X3_iC" id="6b4eZz$Bk2Z" role="lGtFl">
-            <property role="3V$3am" value="statement" />
-            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-            <node concept="3vwNmj" id="2PLbMk5R0Uk" role="8Wnug">
-              <node concept="2OqwBi" id="2PLbMk5R0Ul" role="3vwVQn">
-                <node concept="37vLTw" id="2PLbMk5R0Um" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4VntlICnIHC" resolve="spec" />
-                </node>
-                <node concept="liA8E" id="2PLbMk5R0Un" role="2OqNvi">
-                  <ref role="37wK5l" to="av0y:~IncrementalSpec.isPrincipal(jetbrains.mps.logic.reactor.program.Constraint)" resolve="isPrincipal" />
-                  <node concept="2OqwBi" id="2PLbMk5R0Uo" role="37wK5m">
-                    <node concept="2WthIp" id="2PLbMk5R0Up" role="2Oq$k0" />
-                    <node concept="2XshWL" id="2PLbMk5R0Uq" role="2OqNvi">
-                      <ref role="2WH_rO" node="2PLbMk5R0rZ" resolve="ctr" />
-                      <node concept="Xl_RD" id="2PLbMk5R0Ur" role="2XxRq1">
-                        <property role="Xl_RC" value="main" />
-                      </node>
-                      <node concept="3cmrfG" id="2PLbMk5R1j8" role="2XxRq1">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1LZb2c" id="zdQkICxiHy" role="1SL9yI">
-      <property role="TrG5h" value="placeholder" />
-      <node concept="3cqZAl" id="zdQkICxiHz" role="3clF45" />
-      <node concept="3clFbS" id="zdQkICxiHB" role="3clF47">
-        <node concept="3SKdUt" id="zdQkICxiVw" role="3cqZAp">
-          <node concept="1PaTwC" id="zdQkICxiVx" role="1aUNEU">
-            <node concept="3oM_SD" id="zdQkICxiVH" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME" />
-            </node>
-            <node concept="3oM_SD" id="zdQkICxiVJ" role="1PaTwD">
-              <property role="3oM_SC" value="this" />
-            </node>
-            <node concept="3oM_SD" id="zdQkICxiVM" role="1PaTwD">
-              <property role="3oM_SC" value="test" />
-            </node>
-            <node concept="3oM_SD" id="zdQkICxiVQ" role="1PaTwD">
-              <property role="3oM_SC" value="case" />
-            </node>
-            <node concept="3oM_SD" id="zdQkICxiVV" role="1PaTwD">
-              <property role="3oM_SC" value="is" />
-            </node>
-            <node concept="3oM_SD" id="zdQkICxiW1" role="1PaTwD">
-              <property role="3oM_SC" value="obsolete" />
-            </node>
-          </node>
-        </node>
-        <node concept="3vwNmj" id="zdQkICxjbC" role="3cqZAp">
-          <node concept="3clFbT" id="zdQkICxjbY" role="3vwVQn">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1lH9Xt" id="7qe1GumASGN">
     <property role="TrG5h" value="VarModificationCheckerUtil" />
     <node concept="1LZb2c" id="7qe1GumUkfC" role="1SL9yI">
@@ -4374,5 +4006,81 @@
     </node>
     <node concept="2tJIrI" id="4e0TwrfEQxy" role="jymVt" />
   </node>
+  <node concept="1lH9Xt" id="tyIfzBA5cK">
+    <property role="TrG5h" value="Analyses" />
+    <property role="3OwPAg" value="true" />
+    <node concept="2XrIbr" id="2PLbMk5R0rZ" role="1qtyYc">
+      <property role="TrG5h" value="ctr" />
+      <node concept="37vLTG" id="2PLbMk5R0uz" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="2PLbMk5R0v0" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2PLbMk5R0vk" role="3clF46">
+        <property role="TrG5h" value="arity" />
+        <node concept="10Oyi0" id="2PLbMk5R0vP" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="2PLbMk5R0tG" role="3clF45">
+        <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
+      </node>
+      <node concept="3clFbS" id="2PLbMk5R0s1" role="3clF47">
+        <node concept="3clFbF" id="2PLbMk5R0xR" role="3cqZAp">
+          <node concept="2OqwBi" id="2PLbMk5R0gI" role="3clFbG">
+            <node concept="2ShNRf" id="2PLbMk5QY2H" role="2Oq$k0">
+              <node concept="1pGfFk" id="2PLbMk5QZX8" role="2ShVmc">
+                <ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+                <node concept="2YIFZM" id="2PLbMk5R01n" role="37wK5m">
+                  <ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+                  <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int)" resolve="symbol" />
+                  <node concept="37vLTw" id="2PLbMk5RnWK" role="37wK5m">
+                    <ref role="3cqZAo" node="2PLbMk5R0uz" resolve="name" />
+                  </node>
+                  <node concept="37vLTw" id="2PLbMk5Ro0g" role="37wK5m">
+                    <ref role="3cqZAo" node="2PLbMk5R0vk" resolve="arity" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="2PLbMk5R0pP" role="2OqNvi">
+              <ref role="37wK5l" to="i348:4sSe4$oM2zI" resolve="toConstraint" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="2PLbMk5R0zx" role="1B3o_S" />
+    </node>
+    <node concept="1LZb2c" id="zdQkICxiHy" role="1SL9yI">
+      <property role="TrG5h" value="placeholder" />
+      <node concept="3cqZAl" id="zdQkICxiHz" role="3clF45" />
+      <node concept="3clFbS" id="zdQkICxiHB" role="3clF47">
+        <node concept="3SKdUt" id="zdQkICxiVw" role="3cqZAp">
+          <node concept="1PaTwC" id="zdQkICxiVx" role="1aUNEU">
+            <node concept="3oM_SD" id="zdQkICxiVH" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="zdQkICxiVJ" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="zdQkICxiVM" role="1PaTwD">
+              <property role="3oM_SC" value="test" />
+            </node>
+            <node concept="3oM_SD" id="zdQkICxiVQ" role="1PaTwD">
+              <property role="3oM_SC" value="case" />
+            </node>
+            <node concept="3oM_SD" id="zdQkICxiVV" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="zdQkICxiW1" role="1PaTwD">
+              <property role="3oM_SC" value="obsolete" />
+            </node>
+          </node>
+        </node>
+        <node concept="3vwNmj" id="zdQkICxjbC" role="3cqZAp">
+          <node concept="3clFbT" id="zdQkICxjbY" role="3vwVQn">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
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 3302fad5..c89ba7b6 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
@@ -3608,14 +3608,6 @@
                           <node concept="37vLTw" id="7eQMSyzaBa7" role="37wK5m">
                             <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
                           </node>
-                          <node concept="2OqwBi" id="5tAk4yVPvtF" role="37wK5m">
-                            <node concept="37vLTw" id="5tAk4yVPuSd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
-                            </node>
-                            <node concept="liA8E" id="5tAk4yVPvXG" role="2OqNvi">
-                              <ref role="37wK5l" to="hano:2WtKs4tZfgb" resolve="programSpec" />
-                            </node>
-                          </node>
                           <node concept="10Nm6u" id="4J__M6YF6f" role="37wK5m" />
                           <node concept="37vLTw" id="3o9wrC3u6jn" role="37wK5m">
                             <ref role="3cqZAo" node="3o9wrC3tYXa" resolve="supervisor" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 0eff9d92..4e135e0e 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -3252,21 +3252,8 @@
                 <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
               </node>
               <node concept="TSZUe" id="7WKNeR8TcYb" role="2OqNvi">
-                <node concept="2OqwBi" id="5tAk4yVTE76" role="25WWJ7">
-                  <node concept="37vLTw" id="5tAk4yVTD2S" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5tAk4yVTBuj" resolve="tcStep" />
-                  </node>
-                  <node concept="liA8E" id="5tAk4yVTxg2" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:5tAk4yVSZ1V" resolve="withProgramSpec" />
-                    <node concept="2OqwBi" id="5tAk4yVTy59" role="37wK5m">
-                      <node concept="37vLTw" id="5tAk4yVTxAu" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
-                      </node>
-                      <node concept="liA8E" id="5tAk4yVTyvs" role="2OqNvi">
-                        <ref role="37wK5l" to="hano:2WtKs4tZfgb" resolve="programSpec" />
-                      </node>
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="5tAk4yVTD2S" role="25WWJ7">
+                  <ref role="3cqZAo" node="5tAk4yVTBuj" resolve="tcStep" />
                 </node>
               </node>
             </node>
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 f8476cbd..0e329838 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
@@ -63,7 +63,6 @@
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
-    <import index="xnrr" ref="r:4fd33103-fc30-42f4-a8cf-d1e858f21988(jetbrains.mps.lang.coderules.program.analysis)" implicit="true" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -5619,38 +5618,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5tAk4yVSOYv" role="jymVt" />
-    <node concept="3clFb_" id="5tAk4yVSZ1V" role="jymVt">
-      <property role="TrG5h" value="withProgramSpec" />
-      <node concept="3clFbS" id="5tAk4yVSZ1X" role="3clF47">
-        <node concept="3clFbF" id="5tAk4yVSZ1Y" role="3cqZAp">
-          <node concept="37vLTI" id="5tAk4yVSZ1Z" role="3clFbG">
-            <node concept="37vLTw" id="5tAk4yVSZ20" role="37vLTx">
-              <ref role="3cqZAo" node="5tAk4yVSZ28" resolve="progSpec" />
-            </node>
-            <node concept="2OqwBi" id="5tAk4yVSZ21" role="37vLTJ">
-              <node concept="Xjq3P" id="5tAk4yVSZ22" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5tAk4yVSZ23" role="2OqNvi">
-                <ref role="2Oxat5" node="5tAk4yVRB0S" resolve="progSpec" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="5tAk4yVT1pU" role="3cqZAp">
-          <node concept="Xjq3P" id="5tAk4yVT1rD" role="3cqZAk" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="5tAk4yVSZ27" role="3clF45">
-        <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-      </node>
-      <node concept="37vLTG" id="5tAk4yVSZ28" role="3clF46">
-        <property role="TrG5h" value="progSpec" />
-        <node concept="3uibUv" id="5tAk4yW2gDt" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5tAk4yVSZ26" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="5tAk4yVRV8k" role="jymVt" />
     <node concept="3clFb_" id="RZQG98YN6h" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <node concept="37vLTG" id="RZQG98YN6i" role="3clF46">
@@ -5977,53 +5944,6 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="3OUB6BBnFtT" role="3cqZAp" />
-                  <node concept="3clFbJ" id="5tAk4yVSrvQ" role="3cqZAp">
-                    <node concept="3clFbS" id="5tAk4yVSrvS" role="3clFbx">
-                      <node concept="3clFbF" id="5tAk4yVSwzK" role="3cqZAp">
-                        <node concept="37vLTI" id="5tAk4yVSxWh" role="3clFbG">
-                          <node concept="37vLTw" id="5tAk4yVSwzI" role="37vLTJ">
-                            <ref role="3cqZAo" node="5tAk4yVSjzN" resolve="outEff" />
-                          </node>
-                          <node concept="2OqwBi" id="5tAk4yVQS_a" role="37vLTx">
-                            <node concept="liA8E" id="5tAk4yVQTL9" role="2OqNvi">
-                              <ref role="37wK5l" to="1yqb:51ek2rQD9Pw" resolve="compose" />
-                              <node concept="1bVj0M" id="5tAk4yVR1Jk" role="37wK5m">
-                                <node concept="3clFbS" id="5tAk4yVR1Jl" role="1bW5cS">
-                                  <node concept="3clFbF" id="5tAk4yVR2Ns" role="3cqZAp">
-                                    <node concept="2YIFZM" id="5tAk4yVRlsW" role="3clFbG">
-                                      <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                                      <ref role="37wK5l" to="1yqb:6BMBBPCUL2C" resolve="of" />
-                                      <node concept="2OqwBi" id="5tAk4yVQYm4" role="37wK5m">
-                                        <node concept="10M0yZ" id="5tAk4yVQXfR" role="2Oq$k0">
-                                          <ref role="3cqZAo" to="1yqb:5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
-                                          <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                        </node>
-                                        <node concept="liA8E" id="5tAk4yVQZDO" role="2OqNvi">
-                                          <ref role="37wK5l" to="1yqb:6BMBBPCRIcz" resolve="is" />
-                                          <node concept="37vLTw" id="5tAk4yVRP0o" role="37wK5m">
-                                            <ref role="3cqZAo" node="5tAk4yVRB0S" resolve="progSpec" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="5tAk4yVSz57" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5tAk4yVSjzN" resolve="outEff" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3y3z36" id="5tAk4yVSueI" role="3clFbw">
-                      <node concept="10Nm6u" id="5tAk4yVSvhG" role="3uHU7w" />
-                      <node concept="37vLTw" id="5tAk4yVSsQX" role="3uHU7B">
-                        <ref role="3cqZAo" node="5tAk4yVRB0S" resolve="progSpec" />
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3cpWs6" id="51ek2rQPAle" role="3cqZAp">
                     <node concept="37vLTw" id="5tAk4yVSHqx" role="3cqZAk">
                       <ref role="3cqZAo" node="5tAk4yVSjzN" resolve="outEff" />
@@ -6207,13 +6127,6 @@
     <node concept="3uibUv" id="5gVsyvERbQR" role="1zkMxy">
       <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
     </node>
-    <node concept="312cEg" id="5tAk4yVRB0S" role="jymVt">
-      <property role="TrG5h" value="progSpec" />
-      <node concept="3Tm6S6" id="5tAk4yVR$P7" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yW2gXA" role="1tU5fm">
-        <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="1FOQehxypKu">
     <property role="TrG5h" value="LaunchProblemReportItem" />
@@ -14165,15 +14078,6 @@
               <node concept="10Nm6u" id="5JGToLARb1L" role="33vP2m" />
             </node>
           </node>
-          <node concept="3cpWs8" id="57Rdq$NvSQO" role="3cqZAp">
-            <node concept="3cpWsn" id="57Rdq$NvSQP" role="3cpWs9">
-              <property role="TrG5h" value="incrSpec" />
-              <node concept="3uibUv" id="57Rdq$NvSQQ" role="1tU5fm">
-                <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-              </node>
-              <node concept="10Nm6u" id="5JGToLARbiU" role="33vP2m" />
-            </node>
-          </node>
           <node concept="3clFbJ" id="57Rdq$NvAI5" role="3cqZAp">
             <node concept="3clFbS" id="57Rdq$NvAI7" role="3clFbx">
               <node concept="3clFbF" id="1XKnVOE37A" role="3cqZAp">
@@ -14198,68 +14102,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="3clFbH" id="1XKnVOE4cy" role="3cqZAp" />
-              <node concept="3cpWs8" id="57Rdq$NvAXp" role="3cqZAp">
-                <node concept="3cpWsn" id="57Rdq$NvAXq" role="3cpWs9">
-                  <property role="TrG5h" value="ruleProcessingSession" />
-                  <node concept="3uibUv" id="57Rdq$NvAXr" role="1tU5fm">
-                    <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-                  </node>
-                  <node concept="2OqwBi" id="57Rdq$NvAXs" role="33vP2m">
-                    <node concept="1rXfSq" id="57Rdq$NvAXt" role="2Oq$k0">
-                      <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getAspectCachedData" />
-                      <node concept="37vLTw" id="57Rdq$NvAXu" role="37wK5m">
-                        <ref role="3cqZAo" node="57Rdq$NtDNb" resolve="aspectClique" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="51nMZI9Bthi" role="2OqNvi">
-                      <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
-                      <node concept="10M0yZ" id="51nMZI9Bthj" role="37wK5m">
-                        <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-                        <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
-                      </node>
-                      <node concept="1bVj0M" id="51nMZI9Bthk" role="37wK5m">
-                        <node concept="3clFbS" id="51nMZI9Bthl" role="1bW5cS">
-                          <node concept="3clFbF" id="51nMZI9Bthm" role="3cqZAp">
-                            <node concept="1rXfSq" id="51nMZI9Bthn" role="3clFbG">
-                              <ref role="37wK5l" node="3OUB6BBxkCB" resolve="createRuleProcessingSession" />
-                              <node concept="37vLTw" id="51nMZI9BBQP" role="37wK5m">
-                                <ref role="3cqZAo" node="57Rdq$NtDNb" resolve="aspectClique" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="57Rdq$NvU9R" role="3cqZAp">
-                <node concept="37vLTI" id="57Rdq$NvV6w" role="3clFbG">
-                  <node concept="37vLTw" id="57Rdq$NvU9P" role="37vLTJ">
-                    <ref role="3cqZAo" node="57Rdq$NvSQP" resolve="incrSpec" />
-                  </node>
-                  <node concept="2OqwBi" id="57Rdq$NvAXJ" role="37vLTx">
-                    <node concept="2OqwBi" id="57Rdq$NvAXK" role="2Oq$k0">
-                      <node concept="2OqwBi" id="57Rdq$NvAXL" role="2Oq$k0">
-                        <node concept="37vLTw" id="57Rdq$NvAXM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="57Rdq$NvAXq" resolve="ruleProcessingSession" />
-                        </node>
-                        <node concept="liA8E" id="57Rdq$NvAXN" role="2OqNvi">
-                          <ref role="37wK5l" to="hano:5tAk4yW01VJ" resolve="programSpecBuilder" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="57Rdq$NvAXO" role="2OqNvi">
-                        <ref role="37wK5l" to="xnrr:57Rdq$NuMzc" resolve="setLevel" />
-                        <node concept="10Nm6u" id="2gPa6JHY3FU" role="37wK5m" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="57Rdq$NvAXQ" role="2OqNvi">
-                      <ref role="37wK5l" to="xnrr:5tAk4yVVZZP" resolve="toSpec" />
-                    </node>
-                  </node>
-                </node>
-              </node>
             </node>
             <node concept="37vLTw" id="57Rdq$NvAPD" role="3clFbw">
               <ref role="3cqZAo" node="57Rdq$NvvzV" resolve="withPreamble" />
@@ -14267,32 +14109,24 @@
           </node>
           <node concept="3clFbH" id="57Rdq$NtDNp" role="3cqZAp" />
           <node concept="3clFbF" id="57Rdq$NtDNq" role="3cqZAp">
-            <node concept="2OqwBi" id="57Rdq$NvWgI" role="3clFbG">
-              <node concept="2ShNRf" id="57Rdq$NtDNr" role="2Oq$k0">
-                <node concept="1pGfFk" id="57Rdq$NtDNs" role="2ShVmc">
-                  <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
-                  <node concept="2OqwBi" id="57Rdq$NtDNt" role="37wK5m">
-                    <node concept="liA8E" id="57Rdq$NtDNx" role="2OqNvi">
-                      <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
-                    </node>
-                    <node concept="2OqwBi" id="57Rdq$NtDNu" role="2Oq$k0">
-                      <node concept="37vLTw" id="57Rdq$NtDNv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
-                      </node>
-                      <node concept="liA8E" id="57Rdq$NtDNw" role="2OqNvi">
-                        <ref role="37wK5l" node="1z4$59iwuVK" resolve="service" />
-                      </node>
-                    </node>
+            <node concept="2ShNRf" id="57Rdq$NtDNr" role="3clFbG">
+              <node concept="1pGfFk" id="57Rdq$NtDNs" role="2ShVmc">
+                <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
+                <node concept="2OqwBi" id="57Rdq$NtDNt" role="37wK5m">
+                  <node concept="liA8E" id="57Rdq$NtDNx" role="2OqNvi">
+                    <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
                   </node>
-                  <node concept="37vLTw" id="57Rdq$NtDNy" role="37wK5m">
-                    <ref role="3cqZAo" node="57Rdq$NtDNi" resolve="sessionToken" />
+                  <node concept="2OqwBi" id="57Rdq$NtDNu" role="2Oq$k0">
+                    <node concept="37vLTw" id="57Rdq$NtDNv" role="2Oq$k0">
+                      <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
+                    </node>
+                    <node concept="liA8E" id="57Rdq$NtDNw" role="2OqNvi">
+                      <ref role="37wK5l" node="1z4$59iwuVK" resolve="service" />
+                    </node>
                   </node>
                 </node>
-              </node>
-              <node concept="liA8E" id="57Rdq$NvYsc" role="2OqNvi">
-                <ref role="37wK5l" node="5tAk4yVSZ1V" resolve="withProgramSpec" />
-                <node concept="37vLTw" id="57Rdq$NvYU8" role="37wK5m">
-                  <ref role="3cqZAo" node="57Rdq$NvSQP" resolve="incrSpec" />
+                <node concept="37vLTw" id="57Rdq$NtDNy" role="37wK5m">
+                  <ref role="3cqZAo" node="57Rdq$NtDNi" resolve="sessionToken" />
                 </node>
               </node>
             </node>
@@ -15672,66 +15506,6 @@
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="5tAk4yVTd8L" role="3cqZAp">
-            <node concept="3cpWsn" id="5tAk4yVTd8M" role="3cpWs9">
-              <property role="TrG5h" value="incrProgSpec" />
-              <node concept="3uibUv" id="5tAk4yW0Na9" role="1tU5fm">
-                <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-              </node>
-              <node concept="2OqwBi" id="5tAk4yW0hlg" role="33vP2m">
-                <node concept="2OqwBi" id="5tAk4yW0fLR" role="2Oq$k0">
-                  <node concept="2OqwBi" id="5tAk4yVTktT" role="2Oq$k0">
-                    <node concept="37vLTw" id="51nMZI9BlXd" role="2Oq$k0">
-                      <ref role="3cqZAo" node="51nMZI9BiEU" resolve="ruleProcessingSession" />
-                    </node>
-                    <node concept="liA8E" id="5tAk4yW08No" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:5tAk4yW01VJ" resolve="programSpecBuilder" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="5tAk4yW0gzX" role="2OqNvi">
-                    <ref role="37wK5l" to="xnrr:5tAk4yVVXiF" resolve="assertingContracts" />
-                    <node concept="37vLTw" id="5tAk4yW0$ko" role="37wK5m">
-                      <ref role="3cqZAo" node="5tAk4yW0v_k" resolve="assertingContracts" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="5tAk4yW0iau" role="2OqNvi">
-                  <ref role="37wK5l" to="xnrr:5tAk4yVVZZP" resolve="toSpec" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1X3_iC" id="2fVm_55dBAR" role="lGtFl">
-            <property role="3V$3am" value="statement" />
-            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-            <node concept="3clFbJ" id="scOg5xDdN2" role="8Wnug">
-              <node concept="3clFbS" id="scOg5xDdN4" role="3clFbx">
-                <node concept="3clFbF" id="scOg5xDiix" role="3cqZAp">
-                  <node concept="1rXfSq" id="scOg5xDiiv" role="3clFbG">
-                    <ref role="37wK5l" node="scOg5xBW3c" resolve="reportWarning" />
-                    <node concept="Xl_RD" id="scOg5xDiJI" role="37wK5m">
-                      <property role="Xl_RC" value="Incremental processing is requested, but program can't be executed incrementally!" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="scOg5xDhQA" role="3clFbw">
-                <node concept="2OqwBi" id="scOg5xDhQC" role="3fr31v">
-                  <node concept="2OqwBi" id="scOg5xDhQD" role="2Oq$k0">
-                    <node concept="37vLTw" id="scOg5xDhQE" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5tAk4yVTd8M" resolve="incrProgSpec" />
-                    </node>
-                    <node concept="liA8E" id="scOg5xDhQF" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~IncrementalSpec.ability()" resolve="ability" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="scOg5xDhQG" role="2OqNvi">
-                    <ref role="37wK5l" to="av0y:~IncrementalSpec$Enabled.allowed()" resolve="allowed" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbH" id="5tAk4yW0AV3" role="3cqZAp" />
           <node concept="3cpWs8" id="3OUB6BByIE0" role="3cqZAp">
             <node concept="3cpWsn" id="3OUB6BByIE1" role="3cpWs9">
@@ -15789,31 +15563,23 @@
             </node>
           </node>
           <node concept="3clFbF" id="7i3KM7gOQTj" role="3cqZAp">
-            <node concept="2OqwBi" id="5tAk4yVTodK" role="3clFbG">
-              <node concept="2ShNRf" id="7i3KM7gOQTk" role="2Oq$k0">
-                <node concept="1pGfFk" id="7i3KM7gOQTl" role="2ShVmc">
-                  <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
-                  <node concept="2OqwBi" id="61G6TdCq5fI" role="37wK5m">
-                    <node concept="liA8E" id="1z4$59iAH1O" role="2OqNvi">
-                      <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
+            <node concept="2ShNRf" id="7i3KM7gOQTk" role="3clFbG">
+              <node concept="1pGfFk" id="7i3KM7gOQTl" role="2ShVmc">
+                <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
+                <node concept="2OqwBi" id="61G6TdCq5fI" role="37wK5m">
+                  <node concept="liA8E" id="1z4$59iAH1O" role="2OqNvi">
+                    <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
+                  </node>
+                  <node concept="2OqwBi" id="1z4$59iAF1N" role="2Oq$k0">
+                    <node concept="37vLTw" id="61G6TdCq5qB" role="2Oq$k0">
+                      <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
                     </node>
-                    <node concept="2OqwBi" id="1z4$59iAF1N" role="2Oq$k0">
-                      <node concept="37vLTw" id="61G6TdCq5qB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
-                      </node>
-                      <node concept="liA8E" id="1z4$59iAFYU" role="2OqNvi">
-                        <ref role="37wK5l" node="1z4$59iwuVK" resolve="service" />
-                      </node>
+                    <node concept="liA8E" id="1z4$59iAFYU" role="2OqNvi">
+                      <ref role="37wK5l" node="1z4$59iwuVK" resolve="service" />
                     </node>
                   </node>
-                  <node concept="10Nm6u" id="55xYlrmhdZ5" role="37wK5m" />
-                </node>
-              </node>
-              <node concept="liA8E" id="5tAk4yVTo_k" role="2OqNvi">
-                <ref role="37wK5l" node="5tAk4yVSZ1V" resolve="withProgramSpec" />
-                <node concept="37vLTw" id="5tAk4yVTstK" role="37wK5m">
-                  <ref role="3cqZAo" node="5tAk4yVTd8M" resolve="incrProgSpec" />
                 </node>
+                <node concept="10Nm6u" id="55xYlrmhdZ5" role="37wK5m" />
               </node>
             </node>
           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index d01d2397..4af66cd2 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -2251,18 +2251,6 @@
                                   <node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
                                     <ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
                                   </node>
-                                  <node concept="2OqwBi" id="3VwM5b5$U8V" role="37wK5m">
-                                    <node concept="37vLTw" id="3VwM5b5$U8W" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="51ek2rQHHIn" resolve="inEff" />
-                                    </node>
-                                    <node concept="liA8E" id="3VwM5b5$U8X" role="2OqNvi">
-                                      <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
-                                      <node concept="10M0yZ" id="3VwM5b5$U8Y" role="37wK5m">
-                                        <ref role="3cqZAo" node="5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
-                                        <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                      </node>
-                                    </node>
-                                  </node>
                                   <node concept="37vLTw" id="4J__M6MUpd" role="37wK5m">
                                     <ref role="3cqZAo" node="5gVsyvEOU28" resolve="sessionToken" />
                                   </node>
@@ -7920,23 +7908,6 @@
         </node>
       </node>
     </node>
-    <node concept="Wx3nA" id="5tAk4yVOMI9" role="jymVt">
-      <property role="TrG5h" value="PROGRAM_SPEC" />
-      <node concept="3Tm1VV" id="5tAk4yVOMIa" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yVOMIb" role="1tU5fm">
-        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
-        <node concept="3uibUv" id="5tAk4yW2jaC" role="11_B2D">
-          <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-        </node>
-      </node>
-      <node concept="2YIFZM" id="5tAk4yVOMId" role="33vP2m">
-        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
-        <node concept="3VsKOn" id="5tAk4yVOO2l" role="37wK5m">
-          <ref role="3VsUkX" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="2j1FRbwZcsx" role="jymVt" />
     <node concept="3clFbW" id="RZQG98V8sL" role="jymVt">
       <node concept="3cqZAl" id="RZQG98V8sN" role="3clF45" />
@@ -8011,18 +7982,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="5tAk4yVOV2A" role="37wK5m">
-                      <node concept="37vLTw" id="799SgOKcn3A" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
-                      </node>
-                      <node concept="liA8E" id="5tAk4yVOVpe" role="2OqNvi">
-                        <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
-                        <node concept="10M0yZ" id="5tAk4yW2kum" role="37wK5m">
-                          <ref role="3cqZAo" to="av0y:~IncrementalSpec.DefaultSpec" resolve="DefaultSpec" />
-                          <ref role="1PxDUh" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-                        </node>
-                      </node>
-                    </node>
                   </node>
                 </node>
                 <node concept="3clFbH" id="1T5MAgPuza1" role="3cqZAp" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index 75396d4a..f94f98b6 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -6058,16 +6058,6 @@
       <node concept="3Tm1VV" id="5EDW3XF60ah" role="1B3o_S" />
       <node concept="3clFbS" id="5EDW3XF60ai" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="5EDW3XF5Zaw" role="jymVt" />
-    <node concept="3clFb_" id="2WtKs4tZlCC" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="programSpecBuilder" />
-      <node concept="3clFbS" id="2WtKs4tZlCF" role="3clF47" />
-      <node concept="3Tm1VV" id="2WtKs4tZlzz" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yVYbfK" role="3clF45">
-        <ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5EDW3XF5Zai" role="jymVt" />
     <node concept="312cEg" id="1LBj9w_9Vjc" role="jymVt">
       <property role="TrG5h" value="coderulesAspect" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 8c5042c9..f7b73a10 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -8254,6 +8254,15 @@
       <node concept="3Tmbuc" id="1H_6AUSXuYB" role="1B3o_S" />
     </node>
     <node concept="3Tm1VV" id="1H_6AUSXnyl" role="1B3o_S" />
+    <node concept="2AHcQZ" id="6AZXE2vtEF3" role="2AJF6D">
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <node concept="2B6LJw" id="6AZXE2vtEM4" role="2B76xF">
+        <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+        <node concept="3clFbT" id="6AZXE2vtFmQ" role="2B70Vg">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="5EDW3XDYeWv">
     <property role="3GE5qa" value="query" />
@@ -8460,6 +8469,15 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="2WtKs4u1ogL" role="1B3o_S" />
+    <node concept="2AHcQZ" id="6AZXE2vtFIj" role="2AJF6D">
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <node concept="2B6LJw" id="6AZXE2vtFJj" role="2B76xF">
+        <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+        <node concept="3clFbT" id="6AZXE2vtFL3" role="2B70Vg">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="5X1yxJHUo54">
     <property role="TrG5h" value="TemplateApplicationException" />
@@ -8621,6 +8639,15 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="5tAk4yVWROV" role="1B3o_S" />
+    <node concept="2AHcQZ" id="6AZXE2vtFzh" role="2AJF6D">
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <node concept="2B6LJw" id="6AZXE2vtFCi" role="2B76xF">
+        <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+        <node concept="3clFbT" id="6AZXE2vtFE6" role="2B70Vg">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="6PWFJfG5LMK">
     <property role="TrG5h" value="Memo" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index 82ce2a58..54af0f50 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -20,7 +20,6 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
-    <import index="xnrr" ref="r:4fd33103-fc30-42f4-a8cf-d1e858f21988(jetbrains.mps.lang.coderules.program.analysis)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />