diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
index f37241d4..1a3e4b8e 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -6397,32 +6397,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1CcQBrQmOUM" role="jymVt" />
-    <node concept="3clFb_" id="1CcQBrQmOQT" role="jymVt">
-      <property role="TrG5h" value="typeTerm" />
-      <node concept="37vLTG" id="1CcQBrQmPfS" role="3clF46">
-        <property role="TrG5h" value="nodeReference" />
-        <node concept="3uibUv" id="1CcQBrQmPhE" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1CcQBrQmOQW" role="1B3o_S" />
-      <node concept="3clFbS" id="1CcQBrQmOQX" role="3clF47">
-        <node concept="3clFbF" id="1CcQBrQn796" role="3cqZAp">
-          <node concept="3EllGN" id="1CcQBrQn797" role="3clFbG">
-            <node concept="37vLTw" id="1CcQBrQn8hN" role="3ElVtu">
-              <ref role="3cqZAo" node="1CcQBrQmPfS" resolve="nodeReference" />
-            </node>
-            <node concept="37vLTw" id="1CcQBrQn8bQ" role="3ElQJh">
-              <ref role="3cqZAo" node="1CcQBrQn5Nm" resolve="nodeRef2Term" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="1CcQBrQmPcH" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1CcQBrQmOxY" role="jymVt" />
     <node concept="3clFb_" id="5tpkEj3JHbg" role="jymVt">
       <property role="TrG5h" value="error" />
       <node concept="37vLTG" id="5tpkEj3JHbh" role="3clF46">
@@ -6604,163 +6578,6 @@
           </node>
         </node>
         <node concept="3clFbH" id="1CcQBrQn4oQ" role="3cqZAp" />
-        <node concept="1DcWWT" id="1CcQBrQn33x" role="3cqZAp">
-          <node concept="3clFbS" id="1CcQBrQn33y" role="2LFqv$">
-            <node concept="3cpWs8" id="1CcQBrQn33z" role="3cqZAp">
-              <node concept="3cpWsn" id="1CcQBrQn33$" role="3cpWs9">
-                <property role="TrG5h" value="arguments" />
-                <node concept="3uibUv" id="1CcQBrQn33_" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                  <node concept="3uibUv" id="1CcQBrQn33A" role="11_B2D">
-                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="1CcQBrQn33B" role="33vP2m">
-                  <node concept="1pGfFk" id="1CcQBrQn33C" role="2ShVmc">
-                    <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(java.util.Collection)" resolve="ArrayList" />
-                    <node concept="10QFUN" id="1CcQBrQn33D" role="37wK5m">
-                      <node concept="3uibUv" id="1CcQBrQn33E" role="10QFUM">
-                        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-                        <node concept="3uibUv" id="1CcQBrQn33F" role="11_B2D">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="1CcQBrQn33G" role="10QFUP">
-                        <node concept="37vLTw" id="1CcQBrQn33H" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1CcQBrQn34p" resolve="occ" />
-                        </node>
-                        <node concept="liA8E" id="1CcQBrQn33I" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="1CcQBrQn33J" role="1pMfVU">
-                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="1CcQBrQn33L" role="3cqZAp">
-              <node concept="3cpWsn" id="1CcQBrQn33M" role="3cpWs9">
-                <property role="TrG5h" value="typeTermArg" />
-                <node concept="3uibUv" id="1CcQBrQn33N" role="1tU5fm">
-                  <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
-                  <node concept="3uibUv" id="1CcQBrQn5ma" role="11_B2D">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                  </node>
-                </node>
-                <node concept="10QFUN" id="1CcQBrQn33P" role="33vP2m">
-                  <node concept="3uibUv" id="1CcQBrQn33Q" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
-                    <node concept="3uibUv" id="1CcQBrQn54E" role="11_B2D">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="1CcQBrQn33S" role="10QFUP">
-                    <node concept="37vLTw" id="1CcQBrQn33T" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1CcQBrQn33$" resolve="arguments" />
-                    </node>
-                    <node concept="liA8E" id="1CcQBrQn33U" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
-                      <node concept="3cmrfG" id="1CcQBrQn33V" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="1CcQBrQn33X" role="3cqZAp">
-              <node concept="3cpWsn" id="1CcQBrQn33Y" role="3cpWs9">
-                <property role="TrG5h" value="refArg" />
-                <node concept="3uibUv" id="1CcQBrQn33Z" role="1tU5fm">
-                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                </node>
-                <node concept="1rXfSq" id="1CcQBrQn340" role="33vP2m">
-                  <ref role="37wK5l" node="1CcQBrQmZQL" resolve="getNodeReference" />
-                  <node concept="2OqwBi" id="1CcQBrQn341" role="37wK5m">
-                    <node concept="37vLTw" id="1CcQBrQn342" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1CcQBrQn33$" resolve="arguments" />
-                    </node>
-                    <node concept="liA8E" id="1CcQBrQn343" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
-                      <node concept="3cmrfG" id="1CcQBrQn344" role="37wK5m">
-                        <property role="3cmrfH" value="1" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1CcQBrQn345" role="3cqZAp" />
-            <node concept="3cpWs8" id="1CcQBrQn346" role="3cqZAp">
-              <node concept="3cpWsn" id="1CcQBrQn347" role="3cpWs9">
-                <property role="TrG5h" value="typeTerm" />
-                <node concept="3uibUv" id="1CcQBrQn5$N" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                </node>
-                <node concept="2OqwBi" id="1CcQBrQn349" role="33vP2m">
-                  <node concept="2OqwBi" id="1CcQBrQn34a" role="2Oq$k0">
-                    <node concept="37vLTw" id="1CcQBrQn34b" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1CcQBrQn33M" resolve="typeTermArg" />
-                    </node>
-                    <node concept="liA8E" id="1CcQBrQn34c" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="1CcQBrQn34d" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="1CcQBrQn34e" role="3cqZAp">
-              <node concept="3clFbS" id="1CcQBrQn34f" role="3clFbx">
-                <node concept="3clFbF" id="1CcQBrQn34g" role="3cqZAp">
-                  <node concept="37vLTI" id="1CcQBrQn34h" role="3clFbG">
-                    <node concept="37vLTw" id="1CcQBrQn34i" role="37vLTx">
-                      <ref role="3cqZAo" node="1CcQBrQn347" resolve="typeTerm" />
-                    </node>
-                    <node concept="3EllGN" id="1CcQBrQn34j" role="37vLTJ">
-                      <node concept="37vLTw" id="1CcQBrQn34k" role="3ElVtu">
-                        <ref role="3cqZAo" node="1CcQBrQn33Y" resolve="refArg" />
-                      </node>
-                      <node concept="37vLTw" id="1CcQBrQn66g" role="3ElQJh">
-                        <ref role="3cqZAo" node="1CcQBrQn5Nm" resolve="nodeRef2Term" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="1CcQBrQn34m" role="3clFbw">
-                <node concept="10Nm6u" id="1CcQBrQn34n" role="3uHU7w" />
-                <node concept="37vLTw" id="1CcQBrQn34o" role="3uHU7B">
-                  <ref role="3cqZAo" node="1CcQBrQn347" resolve="typeTerm" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="1CcQBrQn34p" role="1Duv9x">
-            <property role="TrG5h" value="occ" />
-            <node concept="3uibUv" id="1CcQBrQn34q" role="1tU5fm">
-              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-            </node>
-          </node>
-          <node concept="2OqwBi" id="1CcQBrQn34r" role="1DdaDG">
-            <node concept="37vLTw" id="1CcQBrQn34s" role="2Oq$k0">
-              <ref role="3cqZAo" node="1CcQBrQmOm5" resolve="storeView" />
-            </node>
-            <node concept="liA8E" id="1CcQBrQn34t" role="2OqNvi">
-              <ref role="37wK5l" to="w7la:~StoreView.occurrences(jetbrains.mps.logic.reactor.program.ConstraintSymbol):java.lang.Iterable" resolve="occurrences" />
-              <node concept="10M0yZ" id="1CcQBrQn4OK" role="37wK5m">
-                <ref role="3cqZAo" to="i348:5uFPQ7CgjLS" resolve="TYPEOF_SYM" />
-                <ref role="1PxDUh" to="i348:4OKkcnfu_zf" resolve="CustomConstraints" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="5tpkEj3JDcs" role="3cqZAp" />
         <node concept="1DcWWT" id="5tpkEj3JDbw" role="3cqZAp">
           <node concept="3clFbS" id="5tpkEj3JDbx" role="2LFqv$">
             <node concept="3cpWs8" id="5tpkEj3JDby" role="3cqZAp">
@@ -7063,28 +6880,6 @@
         </node>
       </node>
     </node>
-    <node concept="312cEg" id="1CcQBrQn5Nm" role="jymVt">
-      <property role="TrG5h" value="nodeRef2Term" />
-      <node concept="3Tm6S6" id="1CcQBrQn5Nn" role="1B3o_S" />
-      <node concept="3rvAFt" id="1CcQBrQn5No" role="1tU5fm">
-        <node concept="3uibUv" id="1CcQBrQn5Np" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-        <node concept="3uibUv" id="1CcQBrQn6mV" role="3rvSg0">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1CcQBrQn5Nr" role="33vP2m">
-        <node concept="3rGOSV" id="1CcQBrQn5Ns" role="2ShVmc">
-          <node concept="3uibUv" id="1CcQBrQn5Nt" role="3rHrn6">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-          <node concept="3uibUv" id="1CcQBrQn6zO" role="3rHtpV">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="5tpkEj3JCKD" role="jymVt">
       <property role="TrG5h" value="nodeRef2Error" />
       <node concept="3Tm6S6" id="5tpkEj3JCKE" role="1B3o_S" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
index 288e3d44..c53eb3c9 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
@@ -513,6 +513,9 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="oI9Yrzaiq" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
     </node>
     <node concept="Wx3nA" id="5tpkEj3JBli" role="jymVt">
       <property role="3TUv4t" value="true" />
@@ -532,6 +535,9 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="oI9Yrzan3" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
     </node>
     <node concept="2tJIrI" id="4OKkcnfu_zg" role="jymVt" />
     <node concept="2YIFZL" id="4OKkcnfu_$d" role="jymVt">