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 e8de88b7..a9ad8a3f 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
@@ -42,13 +42,13 @@
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
-    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" />
-    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <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="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
+    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -520,12 +520,6 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="4705942098322609812" name="jetbrains.mps.lang.smodel.structure.EnumMember_IsOperation" flags="ng" index="21noJN">
-        <child id="4705942098322609813" name="member" index="21noJM" />
-      </concept>
-      <concept id="4705942098322467729" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="ng" index="21nZrQ">
-        <reference id="4705942098322467736" name="decl" index="21nZrZ" />
-      </concept>
       <concept id="1966870290083281362" name="jetbrains.mps.lang.smodel.structure.EnumMember_NameOperation" flags="ng" index="24Tkf9" />
       <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -1432,131 +1426,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="RZQG986dwy" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:72RDgINeSQJ" resolve="ContextRepositoryExpression" />
-      <node concept="14YyZ8" id="RZQG986era" role="1lVwrX">
-        <node concept="14ZrTv" id="RZQG986fNH" role="14ZwWg">
-          <node concept="30G5F_" id="RZQG986fNI" role="150hEN">
-            <node concept="3clFbS" id="RZQG986fNJ" role="2VODD2">
-              <node concept="3clFbF" id="RZQG986fPf" role="3cqZAp">
-                <node concept="2OqwBi" id="RZQG986gPf" role="3clFbG">
-                  <node concept="2OqwBi" id="RZQG986g2H" role="2Oq$k0">
-                    <node concept="2OqwBi" id="RZQG98kxYs" role="2Oq$k0">
-                      <node concept="1iwH7S" id="RZQG98kxJk" role="2Oq$k0" />
-                      <node concept="12$id9" id="RZQG98ky2C" role="2OqNvi">
-                        <node concept="30H73N" id="RZQG98ky3s" role="12$y8L" />
-                      </node>
-                    </node>
-                    <node concept="2Xjw5R" id="RZQG986gbB" role="2OqNvi">
-                      <node concept="3gmYPX" id="RZQG986gfA" role="1xVPHs">
-                        <node concept="3gn64h" id="RZQG986gi0" role="3gmYPZ">
-                          <ref role="3gnhBz" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
-                        </node>
-                      </node>
-                      <node concept="1xIGOp" id="RZQG986gG0" role="1xVPHs" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="RZQG986h08" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="RZQG986h4X" role="150oIE">
-            <node concept="3clFb_" id="RZQG986pLH" role="1Koe22">
-              <property role="TrG5h" value="method" />
-              <node concept="37vLTG" id="RZQG986pLP" role="3clF46">
-                <property role="TrG5h" value="_invocationContext" />
-                <node concept="3uibUv" id="RZQG986pN3" role="1tU5fm">
-                  <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="RZQG986pLI" role="3clF45" />
-              <node concept="3Tm1VV" id="RZQG986pLJ" role="1B3o_S" />
-              <node concept="3clFbS" id="RZQG986pLK" role="3clF47">
-                <node concept="3clFbF" id="RZQG986pRn" role="3cqZAp">
-                  <node concept="2OqwBi" id="RZQG986qlO" role="3clFbG">
-                    <node concept="1eOMI4" id="RZQG986qfM" role="2Oq$k0">
-                      <node concept="10QFUN" id="RZQG986q5s" role="1eOMHV">
-                        <node concept="3uibUv" id="RZQG986qe8" role="10QFUM">
-                          <ref role="3uigEE" to="hano:RZQG984Kmz" resolve="RepositoryProvider" />
-                        </node>
-                        <node concept="2OqwBi" id="RZQG98rJVQ" role="10QFUP">
-                          <node concept="1eOMI4" id="RZQG98rJPI" role="2Oq$k0">
-                            <node concept="3VmV3z" id="RZQG98pf75" role="1eOMHV">
-                              <property role="3VnrPo" value="_invocationContext" />
-                              <node concept="3uibUv" id="RZQG98rJMp" role="3Vn4Tt">
-                                <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="RZQG98rK2q" role="2OqNvi">
-                            <ref role="37wK5l" to="w7la:~InvocationContext.supervisor()" resolve="supervisor" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="RZQG986qss" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:RZQG984Ko7" resolve="repository" />
-                    </node>
-                    <node concept="raruj" id="RZQG986quy" role="lGtFl" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Koe21" id="RZQG986dwz" role="14YRTM">
-          <node concept="3clFb_" id="RZQG986dw$" role="1Koe22">
-            <property role="TrG5h" value="context" />
-            <node concept="37vLTG" id="RZQG986dw_" role="3clF46">
-              <property role="TrG5h" value="session" />
-              <node concept="3uibUv" id="RZQG986dwA" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-              </node>
-            </node>
-            <node concept="3Tm6S6" id="RZQG986dwB" role="1B3o_S" />
-            <node concept="3uibUv" id="RZQG986dwC" role="3clF45">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-            <node concept="3clFbS" id="RZQG986dwD" role="3clF47">
-              <node concept="3clFbF" id="RZQG986dwE" role="3cqZAp">
-                <node concept="2OqwBi" id="RZQG986dwF" role="3clFbG">
-                  <node concept="liA8E" id="RZQG986dwG" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5yr01fEe32D" resolve="contextRepository" />
-                  </node>
-                  <node concept="raruj" id="RZQG986dwH" role="lGtFl" />
-                  <node concept="37vLTw" id="RZQG986dwI" role="2Oq$k0">
-                    <ref role="3cqZAo" node="RZQG986dw_" resolve="session" />
-                    <node concept="1sPUBX" id="RZQG986dwJ" role="lGtFl">
-                      <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                      <node concept="3NFfHV" id="RZQG986dwK" role="1sPUBK">
-                        <node concept="3clFbS" id="RZQG986dwL" role="2VODD2">
-                          <node concept="3clFbF" id="RZQG986dwM" role="3cqZAp">
-                            <node concept="2OqwBi" id="RZQG986dwN" role="3clFbG">
-                              <node concept="30H73N" id="RZQG986dwO" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="RZQG986dwP" role="2OqNvi">
-                                <node concept="3gmYPX" id="RZQG986dwQ" role="1xVPHs">
-                                  <node concept="3gn64h" id="RZQG986dwR" role="3gmYPZ">
-                                    <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                  </node>
-                                  <node concept="3gn64h" id="RZQG986dwS" role="3gmYPZ">
-                                    <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="1laj_RSrXv0" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
       <node concept="1Koe21" id="1laj_RSrYW6" role="1lVwrX">
@@ -14582,294 +14451,6 @@
       <ref role="30HIoZ" to="z8tp:6nJA6bpveD5" resolve="SNodeTypeOperation" />
       <node concept="b5Tf3" id="oI9YrDhNx" role="1lVwrX" />
     </node>
-    <node concept="3aamgX" id="oI9Ys2xi_" role="3acgRq">
-      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
-      <node concept="14YyZ8" id="oI9Ys2xiA" role="1lVwrX">
-        <node concept="14ZrTv" id="oI9Ys2xiB" role="14ZwWg">
-          <node concept="30G5F_" id="oI9Ys2xiC" role="150hEN">
-            <node concept="3clFbS" id="oI9Ys2xiD" role="2VODD2">
-              <node concept="3clFbF" id="oI9Ys2xiE" role="3cqZAp">
-                <node concept="2OqwBi" id="oI9Ys2xiF" role="3clFbG">
-                  <node concept="2OqwBi" id="oI9Ys2xiG" role="2Oq$k0">
-                    <node concept="2Xjw5R" id="oI9Ys2xiI" role="2OqNvi">
-                      <node concept="3gmYPX" id="oI9Ys2xiJ" role="1xVPHs">
-                        <node concept="3gn64h" id="oI9Ys2xiK" role="3gmYPZ">
-                          <ref role="3gnhBz" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="oI9Ys7D7Z" role="2Oq$k0">
-                      <node concept="1iwH7S" id="oI9Ys7CS8" role="2Oq$k0" />
-                      <node concept="12$id9" id="oI9Ys7DpK" role="2OqNvi">
-                        <node concept="30H73N" id="oI9Ys7Dzd" role="12$y8L" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="oI9Ys2xiL" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="oI9Ys2xiM" role="150oIE">
-            <node concept="3clFb_" id="oI9Ys2xiN" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="37vLTG" id="1FOQehwQxOt" role="3clF46">
-                <property role="TrG5h" value="operand" />
-                <node concept="3Tqbb2" id="1FOQehwQy99" role="1tU5fm" />
-              </node>
-              <node concept="3Tm6S6" id="oI9Ys2xiO" role="1B3o_S" />
-              <node concept="3cqZAl" id="oI9Ys2xiP" role="3clF45" />
-              <node concept="3clFbS" id="oI9Ys2xiQ" role="3clF47">
-                <node concept="3clFbF" id="oI9Ys2xiR" role="3cqZAp">
-                  <node concept="2OqwBi" id="oI9Ys2xiS" role="3clFbG">
-                    <node concept="liA8E" id="oI9Ys2xiX" role="2OqNvi">
-                      <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
-                      <node concept="Rm8GO" id="1FOQehwoRqu" role="37wK5m">
-                        <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
-                        <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                        <node concept="1sPUBX" id="1FOQehwwtLS" role="lGtFl">
-                          <ref role="v9R2y" node="1FOQehwoVSb" resolve="ReportKind_MessageStatus" />
-                          <node concept="3NFfHV" id="1FOQehwwum9" role="1sPUBK">
-                            <node concept="3clFbS" id="1FOQehwwuma" role="2VODD2">
-                              <node concept="3clFbF" id="1FOQehwwuCr" role="3cqZAp">
-                                <node concept="2OqwBi" id="1FOQehwwuO4" role="3clFbG">
-                                  <node concept="30H73N" id="1FOQehwwuCq" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="1FOQehwwvv7" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="1FOQehwQzuX" role="37wK5m">
-                        <node concept="liA8E" id="1FOQehwQzWd" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                        </node>
-                        <node concept="2JrnkZ" id="1FOQehwQzv2" role="2Oq$k0">
-                          <node concept="37vLTw" id="1FOQehwQy9N" role="2JrQYb">
-                            <ref role="3cqZAo" node="1FOQehwQxOt" resolve="operand" />
-                            <node concept="29HgVG" id="1FOQehwQ$FF" role="lGtFl">
-                              <node concept="3NFfHV" id="1FOQehwQ_1w" role="3NFExx">
-                                <node concept="3clFbS" id="1FOQehwQ_1x" role="2VODD2">
-                                  <node concept="3clFbF" id="1FOQehwQ_nG" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1FOQehwQ_nI" role="3clFbG">
-                                      <node concept="30H73N" id="1FOQehwQ_nJ" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="1FOQehwQ_nK" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="10Nm6u" id="oI9Ys2xja" role="37wK5m">
-                        <node concept="29HgVG" id="oI9Ys2xjb" role="lGtFl">
-                          <node concept="3NFfHV" id="oI9Ys2xjc" role="3NFExx">
-                            <node concept="3clFbS" id="oI9Ys2xjd" role="2VODD2">
-                              <node concept="3clFbF" id="oI9Ys2xje" role="3cqZAp">
-                                <node concept="2OqwBi" id="oI9Ys2xjf" role="3clFbG">
-                                  <node concept="1PxgMI" id="oI9Ys2xjg" role="2Oq$k0">
-                                    <node concept="chp4Y" id="oI9Ys2Dme" role="3oSUPX">
-                                      <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-                                    </node>
-                                    <node concept="2OqwBi" id="oI9Ys2xji" role="1m5AlR">
-                                      <node concept="30H73N" id="oI9Ys2xjj" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="oI9Ys2xjk" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="oI9Ys2DJH" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:oI9Ys1lF8" resolve="text" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="raruj" id="oI9Ys2xjm" role="lGtFl" />
-                    <node concept="2OqwBi" id="oI9YrWf2v" role="2Oq$k0">
-                      <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
-                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
-                      </node>
-                      <node concept="liA8E" id="3GEs5q_4fTI" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
-                        <node concept="2YIFZM" id="3GEs5q_4fTJ" role="37wK5m">
-                          <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
-                          <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
-                          <node concept="Xl_RD" id="3GEs5q_4fTK" role="37wK5m">
-                            <property role="Xl_RC" value="reporting" />
-                          </node>
-                          <node concept="3VsKOn" id="3GEs5q_4fTL" role="37wK5m">
-                            <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Koe21" id="oI9Ys2xjn" role="14YRTM">
-          <node concept="3clFb_" id="oI9Ys2xjo" role="1Koe22">
-            <property role="TrG5h" value="context" />
-            <node concept="37vLTG" id="oI9Ys2xjp" role="3clF46">
-              <property role="TrG5h" value="session" />
-              <node concept="3uibUv" id="oI9Ys2xjq" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-              </node>
-            </node>
-            <node concept="37vLTG" id="1FOQehwQCqe" role="3clF46">
-              <property role="TrG5h" value="operand" />
-              <node concept="3Tqbb2" id="1FOQehwQCIr" role="1tU5fm" />
-            </node>
-            <node concept="3Tm6S6" id="oI9Ys2xjr" role="1B3o_S" />
-            <node concept="3cqZAl" id="oI9Ys2xjs" role="3clF45" />
-            <node concept="3clFbS" id="oI9Ys2xjt" role="3clF47">
-              <node concept="3clFbF" id="oI9Ys2xju" role="3cqZAp">
-                <node concept="2OqwBi" id="oI9Ys2xjv" role="3clFbG">
-                  <node concept="raruj" id="oI9Ys2xk7" role="lGtFl" />
-                  <node concept="liA8E" id="oI9Ys2EaM" role="2OqNvi">
-                    <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
-                    <node concept="Rm8GO" id="1FOQehwwvIu" role="37wK5m">
-                      <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                      <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
-                      <node concept="1sPUBX" id="1FOQehwwvIv" role="lGtFl">
-                        <ref role="v9R2y" node="1FOQehwoVSb" resolve="ReportKind_MessageStatus" />
-                        <node concept="3NFfHV" id="1FOQehwwvIw" role="1sPUBK">
-                          <node concept="3clFbS" id="1FOQehwwvIx" role="2VODD2">
-                            <node concept="3clFbF" id="1FOQehwwvIy" role="3cqZAp">
-                              <node concept="2OqwBi" id="1FOQehwwvIz" role="3clFbG">
-                                <node concept="30H73N" id="1FOQehwwvI$" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="1FOQehwwvI_" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="1FOQehwQB0Z" role="37wK5m">
-                      <node concept="liA8E" id="1FOQehwQB10" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                      </node>
-                      <node concept="2JrnkZ" id="1FOQehwQB11" role="2Oq$k0">
-                        <node concept="37vLTw" id="1FOQehwQB12" role="2JrQYb">
-                          <ref role="3cqZAo" node="1FOQehwQCqe" resolve="operand" />
-                          <node concept="29HgVG" id="1FOQehwQB13" role="lGtFl">
-                            <node concept="3NFfHV" id="1FOQehwQB14" role="3NFExx">
-                              <node concept="3clFbS" id="1FOQehwQB15" role="2VODD2">
-                                <node concept="3clFbF" id="1FOQehwQB16" role="3cqZAp">
-                                  <node concept="2OqwBi" id="1FOQehwQB17" role="3clFbG">
-                                    <node concept="30H73N" id="1FOQehwQB18" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="1FOQehwQB19" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="10Nm6u" id="oI9Ys2Eb7" role="37wK5m">
-                      <node concept="29HgVG" id="oI9Ys2Eb8" role="lGtFl">
-                        <node concept="3NFfHV" id="oI9Ys2Eb9" role="3NFExx">
-                          <node concept="3clFbS" id="oI9Ys2Eba" role="2VODD2">
-                            <node concept="3clFbF" id="oI9Ys2Ebb" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9Ys2Ebc" role="3clFbG">
-                                <node concept="1PxgMI" id="oI9Ys2Ebd" role="2Oq$k0">
-                                  <node concept="chp4Y" id="oI9Ys2Ebe" role="3oSUPX">
-                                    <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-                                  </node>
-                                  <node concept="2OqwBi" id="oI9Ys2Ebf" role="1m5AlR">
-                                    <node concept="30H73N" id="oI9Ys2Ebg" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="oI9Ys2Ebh" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="oI9Ys2Ebi" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:oI9Ys1lF8" resolve="text" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2YIFZM" id="oI9Ys2xjw" role="2Oq$k0">
-                    <ref role="37wK5l" to="9x2e:oI9YrJ1oq" resolve="application" />
-                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                    <node concept="37vLTw" id="oI9Ys2xjx" role="37wK5m">
-                      <ref role="3cqZAo" node="oI9Ys2xjp" resolve="session" />
-                      <node concept="1ZhdrF" id="oI9Ys2xjy" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <property role="2qtEX8" value="variableDeclaration" />
-                        <node concept="3$xsQk" id="oI9Ys2xjz" role="3$ytzL">
-                          <node concept="3clFbS" id="oI9Ys2xj$" role="2VODD2">
-                            <node concept="3clFbF" id="oI9Ys2xj_" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9Ys2xjA" role="3clFbG">
-                                <node concept="1iwH7S" id="oI9Ys2xjB" role="2Oq$k0" />
-                                <node concept="1iwH70" id="oI9Ys2xjC" role="2OqNvi">
-                                  <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
-                                  <node concept="2OqwBi" id="oI9Ys2xjD" role="1iwH7V">
-                                    <node concept="30H73N" id="oI9Ys2xjE" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="oI9Ys2xjF" role="2OqNvi">
-                                      <node concept="1xMEDy" id="oI9Ys2xjG" role="1xVPHs">
-                                        <node concept="chp4Y" id="oI9Ys2xjH" role="ri$Ld">
-                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="oI9Ys2xk8" role="30HLyM">
-        <node concept="3clFbS" id="oI9Ys2xk9" role="2VODD2">
-          <node concept="3clFbF" id="oI9Ys2xka" role="3cqZAp">
-            <node concept="2OqwBi" id="oI9Ys2xkb" role="3clFbG">
-              <node concept="2OqwBi" id="oI9Ys2xkc" role="2Oq$k0">
-                <node concept="30H73N" id="oI9Ys2xkd" role="2Oq$k0" />
-                <node concept="3TrEf2" id="oI9Ys2xke" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="oI9Ys2xkf" role="2OqNvi">
-                <node concept="chp4Y" id="oI9Ys2y7P" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="6OXbTD$fBEY">
     <property role="TrG5h" value="QueryTemplateImpl" />
@@ -15942,109 +15523,6 @@
       </node>
     </node>
   </node>
-  <node concept="jVnub" id="1FOQehwoVSb">
-    <property role="3GE5qa" value="reporting" />
-    <property role="TrG5h" value="ReportKind_MessageStatus" />
-    <node concept="3aamgX" id="1FOQehwoVTh" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-      <node concept="14YyZ8" id="1FOQehwoWyC" role="1lVwrX">
-        <node concept="14ZrTv" id="1FOQehwoWyI" role="14ZwWg">
-          <node concept="30G5F_" id="1FOQehwoWyJ" role="150hEN">
-            <node concept="3clFbS" id="1FOQehwoWyK" role="2VODD2">
-              <node concept="3clFbF" id="1FOQehwoYWo" role="3cqZAp">
-                <node concept="2OqwBi" id="1FOQehwp0sg" role="3clFbG">
-                  <node concept="2OqwBi" id="1FOQehwoZ9C" role="2Oq$k0">
-                    <node concept="30H73N" id="1FOQehwoYWn" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="1FOQehwoZIb" role="2OqNvi">
-                      <ref role="3TsBF5" to="wq2x:3czCaDvmnOx" resolve="kind" />
-                    </node>
-                  </node>
-                  <node concept="21noJN" id="3czCaDvmo6C" role="2OqNvi">
-                    <node concept="21nZrQ" id="3czCaDvmo6D" role="21noJM">
-                      <ref role="21nZrZ" to="wq2x:3czCaDvmnMt" resolve="info" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="1FOQehwp1AY" role="150oIE">
-            <node concept="Rm8GO" id="1FOQehwp1L3" role="gfFT$">
-              <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
-              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="1FOQehwp1Lh" role="14ZwWg">
-          <node concept="30G5F_" id="1FOQehwp1Li" role="150hEN">
-            <node concept="3clFbS" id="1FOQehwp1Lj" role="2VODD2">
-              <node concept="3clFbF" id="1FOQehwp1Lk" role="3cqZAp">
-                <node concept="2OqwBi" id="1FOQehwp1Ll" role="3clFbG">
-                  <node concept="2OqwBi" id="1FOQehwp1Lm" role="2Oq$k0">
-                    <node concept="30H73N" id="1FOQehwp1Ln" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="1FOQehwp1Lo" role="2OqNvi">
-                      <ref role="3TsBF5" to="wq2x:3czCaDvmnOx" resolve="kind" />
-                    </node>
-                  </node>
-                  <node concept="21noJN" id="3czCaDvmo6E" role="2OqNvi">
-                    <node concept="21nZrQ" id="3czCaDvmo6F" role="21noJM">
-                      <ref role="21nZrZ" to="wq2x:3czCaDvmnMu" resolve="warning" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="1FOQehwp1Lr" role="150oIE">
-            <node concept="Rm8GO" id="1FOQehwp2do" role="gfFT$">
-              <ref role="Rm8GQ" to="2gg1:~MessageStatus.WARNING" resolve="WARNING" />
-              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="1FOQehwp2dF" role="14ZwWg">
-          <node concept="30G5F_" id="1FOQehwp2dG" role="150hEN">
-            <node concept="3clFbS" id="1FOQehwp2dH" role="2VODD2">
-              <node concept="3clFbF" id="1FOQehwp2dI" role="3cqZAp">
-                <node concept="2OqwBi" id="1FOQehwp2dJ" role="3clFbG">
-                  <node concept="2OqwBi" id="1FOQehwp2dK" role="2Oq$k0">
-                    <node concept="30H73N" id="1FOQehwp2dL" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="1FOQehwp2dM" role="2OqNvi">
-                      <ref role="3TsBF5" to="wq2x:3czCaDvmnOx" resolve="kind" />
-                    </node>
-                  </node>
-                  <node concept="21noJN" id="3czCaDvmo6G" role="2OqNvi">
-                    <node concept="21nZrQ" id="3czCaDvmo6H" role="21noJM">
-                      <ref role="21nZrZ" to="wq2x:3czCaDvmnMv" resolve="error" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="1FOQehwp2dP" role="150oIE">
-            <node concept="Rm8GO" id="1FOQehwp2Ey" role="gfFT$">
-              <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-            </node>
-          </node>
-        </node>
-        <node concept="j$LIH" id="1FOQehwp3v1" role="14YRTM">
-          <node concept="1lLz0L" id="1FOQehwp3DE" role="1lHHLF">
-            <property role="1lMjX7" value="h1lM37o/error" />
-            <property role="1lLB17" value="unsupported report kind" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="j$LIH" id="1FOQehwp307" role="jxRDz">
-      <node concept="1lLz0L" id="1FOQehwp3aL" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
-        <property role="1lLB17" value="invalid switch usage" />
-      </node>
-    </node>
-  </node>
   <node concept="13MO4I" id="6EY0p2x2d9D">
     <property role="3GE5qa" value="macro" />
     <property role="TrG5h" value="frag_callMacro_parameters" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index f361cc2e..f9ad1e4c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -35,7 +35,6 @@
       </concept>
       <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
       <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
-        <property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
         <property id="1225194472832" name="isVirtual" index="13i0it" />
         <property id="1225194472834" name="isAbstract" index="13i0iv" />
         <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
@@ -1125,28 +1124,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="oI9Ys1Qb1">
-    <ref role="13h7C2" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-    <node concept="13hLZK" id="oI9Ys1Qb2" role="13h7CW">
-      <node concept="3clFbS" id="oI9Ys1Qb3" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="oI9Ys1Qbc" role="13h7CS">
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="applicableToNode" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <ref role="13i0hy" to="tpeu:1653mnvAgrs" resolve="applicableToNode" />
-      <node concept="3Tm1VV" id="oI9Ys1Qbd" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9Ys1Qbi" role="3clF47">
-        <node concept="3clFbF" id="oI9Ys1Qik" role="3cqZAp">
-          <node concept="3clFbT" id="oI9Ys1Qij" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="oI9Ys1Qbj" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="34$A1Mf3_W$">
     <property role="3GE5qa" value="rule" />
     <ref role="13h7C2" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 75a5de3a..da67ea85 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -1287,32 +1287,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="72RDgINqIIa">
-    <ref role="1M2myG" to="wq2x:72RDgINeSQJ" resolve="ContextRepositoryExpression" />
-    <node concept="9S07l" id="72RDgINqIIb" role="9Vyp8">
-      <node concept="3clFbS" id="72RDgINqIIc" role="2VODD2">
-        <node concept="3clFbF" id="72RDgINqIPv" role="3cqZAp">
-          <node concept="2OqwBi" id="72RDgINqL2s" role="3clFbG">
-            <node concept="2OqwBi" id="72RDgINqJ4X" role="2Oq$k0">
-              <node concept="nLn13" id="72RDgINqIPu" role="2Oq$k0" />
-              <node concept="2Xjw5R" id="72RDgINqJmE" role="2OqNvi">
-                <node concept="3gmYPX" id="72RDgINqJKj" role="1xVPHs">
-                  <node concept="3gn64h" id="72RDgINqJKk" role="3gmYPZ">
-                    <ref role="3gnhBz" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                  </node>
-                  <node concept="3gn64h" id="72RDgINqKsI" role="3gmYPZ">
-                    <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
-                  </node>
-                </node>
-                <node concept="1xIGOp" id="72RDgINqK6n" role="1xVPHs" />
-              </node>
-            </node>
-            <node concept="3x8VRR" id="72RDgINqMNk" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="4jcOV4hwMzQ">
     <property role="3GE5qa" value="constraint" />
     <ref role="1M2myG" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index b68a5d28..048158a8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -4434,29 +4434,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="oI9Ys1lFq">
-    <ref role="1XX52x" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-    <node concept="3EZMnI" id="oI9Ys1lGg" role="2wV5jI">
-      <node concept="PMmxH" id="oI9Ys1lGh" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0A7n" id="oI9Ys1lGM" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:3czCaDvmnOx" resolve="kind" />
-      </node>
-      <node concept="3F0ifn" id="oI9Ys1lGi" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
-      <node concept="3F1sOY" id="oI9Ys1lGj" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:oI9Ys1lF8" resolve="text" />
-      </node>
-      <node concept="3F0ifn" id="oI9Ys1lGk" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-      </node>
-      <node concept="l2Vlx" id="oI9Ys1lGl" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="3p36aQ" id="1090FxOTEnS">
     <property role="3GE5qa" value="constraint" />
     <ref role="aqKnT" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
@@ -4924,16 +4901,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="72RDgINeSR9">
-    <ref role="1XX52x" to="wq2x:72RDgINeSQJ" resolve="ContextRepositoryExpression" />
-    <node concept="3EZMnI" id="72RDgINeSRe" role="2wV5jI">
-      <node concept="PMmxH" id="72RDgINeSRl" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-      </node>
-      <node concept="l2Vlx" id="72RDgINeSRh" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="4jcOV4hu0nh">
     <property role="3GE5qa" value="constraint" />
     <ref role="1XX52x" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index e821c492..dbd69e30 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1099,32 +1099,6 @@
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
   </node>
-  <node concept="1TIwiD" id="oI9Ys1jH2">
-    <property role="EcuMT" value="6958395097955138" />
-    <property role="TrG5h" value="SNodeReportOperation" />
-    <property role="34LRSv" value="report" />
-    <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
-    <node concept="1TJgyi" id="3czCaDvmnOx" role="1TKVEl">
-      <property role="TrG5h" value="kind" />
-      <property role="IQ2nx" value="6958395097963305" />
-      <ref role="AX2Wp" node="3czCaDvmnMr" resolve="ReportKind" />
-      <node concept="3l_iC" id="3czCaDvmnOy" role="lGtFl">
-        <node concept="1TJgyi" id="oI9Ys1lGD" role="3l_iP">
-          <property role="IQ2nx" value="6958395097963305" />
-          <property role="TrG5h" value="kind" />
-          <ref role="AX2Wp" node="oI9Ys1lFh" resolve="ReportKind" />
-        </node>
-      </node>
-    </node>
-    <node concept="1TJgyj" id="oI9Ys1lF8" role="1TKVEi">
-      <property role="IQ2ns" value="6958395097963208" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="text" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="asaX9" id="1laj_RS20iV" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="1mdVbTS8GIV">
     <property role="EcuMT" value="1553157749316176827" />
     <property role="3GE5qa" value="constraint" />
@@ -1272,13 +1246,6 @@
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
   </node>
-  <node concept="1TIwiD" id="72RDgINeSQJ">
-    <property role="EcuMT" value="8122141922656226735" />
-    <property role="TrG5h" value="ContextRepositoryExpression" />
-    <property role="34LRSv" value="repository" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="asaX9" id="5yr01fEdPEx" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="4jcOV4hu088">
     <property role="EcuMT" value="4957570047283823112" />
     <property role="3GE5qa" value="constraint" />
@@ -1330,48 +1297,6 @@
       <ref role="PrY4T" node="1HWyn8iLEBo" resolve="LateParameter" />
     </node>
   </node>
-  <node concept="25R3W" id="3czCaDvmnMr">
-    <property role="TrG5h" value="ReportKind" />
-    <property role="3F6X1D" value="6958395097963217" />
-    <ref role="1H5jkz" node="3czCaDvmnMt" resolve="info" />
-    <node concept="2JgGob" id="3czCaDvmnMs" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3eY/string_name" />
-      <property role="3sfsH" value="5CkWgdpp0p1/by_name" />
-      <node concept="AxPO7" id="oI9Ys1lFh" role="3lCyv">
-        <property role="TrG5h" value="ReportKind" />
-        <property role="3F6X1D" value="6958395097963217" />
-        <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
-        <node concept="M4N5e" id="oI9Ys1lFi" role="M5hS2">
-          <property role="1uS6qo" value="info" />
-          <property role="1uS6qv" value="info" />
-        </node>
-        <node concept="M4N5e" id="oI9Ys1lFj" role="M5hS2">
-          <property role="1uS6qo" value="warning" />
-          <property role="1uS6qv" value="warning" />
-        </node>
-        <node concept="M4N5e" id="oI9Ys1lFm" role="M5hS2">
-          <property role="1uS6qo" value="error" />
-          <property role="1uS6qv" value="error" />
-        </node>
-      </node>
-    </node>
-    <node concept="25R33" id="3czCaDvmnMt" role="25R1y">
-      <property role="TrG5h" value="info" />
-      <property role="3tVfz5" value="6958395097963218" />
-      <ref role="2wpffI" node="oI9Ys1lFi" />
-    </node>
-    <node concept="25R33" id="3czCaDvmnMu" role="25R1y">
-      <property role="TrG5h" value="warning" />
-      <property role="3tVfz5" value="6958395097963219" />
-      <ref role="2wpffI" node="oI9Ys1lFj" />
-    </node>
-    <node concept="25R33" id="3czCaDvmnMv" role="25R1y">
-      <property role="TrG5h" value="error" />
-      <property role="3tVfz5" value="6958395097963222" />
-      <ref role="2wpffI" node="oI9Ys1lFm" />
-    </node>
-    <node concept="asaX9" id="1laj_RSAvJW" role="lGtFl" />
-  </node>
   <node concept="25R3W" id="3czCaDvmnMw">
     <property role="TrG5h" value="FeedbackSeverity" />
     <property role="3GE5qa" value="constraint" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index d60cbef7..3e38b62b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -1541,31 +1541,6 @@
       <ref role="1YaFvo" to="wq2x:12QmIo$yS$B" resolve="RequireAllStatement" />
     </node>
   </node>
-  <node concept="1YbPZF" id="72RDgINeTsf">
-    <property role="TrG5h" value="typeof_ContextRepositoryExpression" />
-    <node concept="3clFbS" id="72RDgINeTsg" role="18ibNy">
-      <node concept="1Z5TYs" id="72RDgINeTOs" role="3cqZAp">
-        <node concept="mw_s8" id="72RDgINeTOK" role="1ZfhKB">
-          <node concept="2c44tf" id="72RDgINeTOG" role="mwGJk">
-            <node concept="3uibUv" id="72RDgINeTPI" role="2c44tc">
-              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="72RDgINeTOv" role="1ZfhK$">
-          <node concept="1Z2H0r" id="72RDgINeTsv" role="mwGJk">
-            <node concept="1YBJjd" id="72RDgINeTuh" role="1Z2MuG">
-              <ref role="1YBMHb" node="72RDgINeTsi" resolve="cre" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="72RDgINeTsi" role="1YuTPh">
-      <property role="TrG5h" value="cre" />
-      <ref role="1YaFvo" to="wq2x:72RDgINeSQJ" resolve="ContextRepositoryExpression" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="1laj_RSrNoT">
     <property role="TrG5h" value="typeof_OriginSpec" />
     <property role="3GE5qa" value="rule" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 6813f804..3ccadfff 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -37,7 +37,6 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <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" />
@@ -48,24 +47,7 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <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="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="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -73,41 +55,20 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
-        <reference id="1116615189566" name="classifier" index="3VsUkX" />
-      </concept>
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
-        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
-      </concept>
-      <concept id="1202776937179" name="jetbrains.mps.lang.generator.structure.AbandonInput_RuleConsequence" flags="lg" index="b5Tf3" />
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1167088157977" name="createRootRule" index="2VS0gm" />
-        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
         <reference id="1112820671508" name="modifiedSwitch" index="phYkn" />
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
-      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
@@ -121,37 +82,20 @@
       </concept>
       <concept id="1167087518662" name="jetbrains.mps.lang.generator.structure.CreateRootRule_Condition" flags="in" index="2VP$b9" />
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
-      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
         <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
-      <concept id="1195158154974" name="jetbrains.mps.lang.generator.structure.InlineSwitch_RuleConsequence" flags="lg" index="14YyZ8">
-        <child id="1195158241124" name="defaultConsequence" index="14YRTM" />
-        <child id="1195158408710" name="case" index="14ZwWg" />
-      </concept>
-      <concept id="1195158388553" name="jetbrains.mps.lang.generator.structure.InlineSwitch_Case" flags="ng" index="14ZrTv">
-        <child id="1195158608805" name="conditionFunction" index="150hEN" />
-        <child id="1195158637244" name="caseConsequence" index="150oIE" />
-      </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
       <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
-      <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
-      <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
-        <child id="8900764248744213871" name="contentNode" index="1Koe22" />
-      </concept>
       <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
-        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
-      </concept>
     </language>
     <language id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage">
       <concept id="2030416617761226491" name="jetbrains.mps.lang.slanguage.structure.Model_IsAspectOperation" flags="nn" index="3zA4fs">
@@ -163,13 +107,6 @@
         <child id="1217890689512" name="userKey" index="2fWi3N" />
       </concept>
       <concept id="1217894033795" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_TransientObjectAccess" flags="nn" index="2g92yo" />
-      <concept id="1229477454423" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalCopiedInputByOutput" flags="nn" index="12$id9">
-        <child id="1229477520175" name="outputNode" index="12$y8L" />
-      </concept>
-      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
-        <reference id="1216860049628" name="label" index="1iwH77" />
-        <child id="1216860049632" name="inputNode" index="1iwH7V" />
-      </concept>
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
       <concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
     </language>
@@ -179,53 +116,18 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <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="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
-        <child id="1154546920563" name="concept" index="3gmYPZ" />
-      </concept>
-      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
-        <reference id="1154546997487" name="concept" index="3gnhBz" />
-      </concept>
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
-        <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
-        <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -320,369 +222,6 @@
   </node>
   <node concept="bUwia" id="oI9YrdoXd">
     <property role="TrG5h" value="reporting" />
-    <node concept="3aamgX" id="oI9YrDh3R" role="3acgRq">
-      <ref role="30HIoZ" to="z8tp:6nJA6bpveD5" resolve="SNodeTypeOperation" />
-      <node concept="b5Tf3" id="oI9YrDhNx" role="1lVwrX" />
-    </node>
-    <node concept="3aamgX" id="oI9YrdoXe" role="3acgRq">
-      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
-      <node concept="1Koe21" id="oI9YrdoXi" role="1lVwrX">
-        <node concept="3clFb_" id="oI9YrdoXo" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="3Tm6S6" id="oI9YrdoXy" role="1B3o_S" />
-          <node concept="3cqZAl" id="oI9YrdoXG" role="3clF45" />
-          <node concept="3clFbS" id="oI9YrdoYk" role="3clF47">
-            <node concept="3clFbF" id="oI9Yrdp0J" role="3cqZAp">
-              <node concept="2OqwBi" id="oI9YrdpxT" role="3clFbG">
-                <node concept="2OqwBi" id="oI9Yrdpd3" role="2Oq$k0">
-                  <node concept="2YIFZM" id="oI9Yrdpd4" role="2Oq$k0">
-                    <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                    <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
-                  </node>
-                  <node concept="liA8E" id="3GEs5q_3xVx" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
-                    <node concept="2YIFZM" id="3GEs5q_3C7H" role="37wK5m">
-                      <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
-                      <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
-                      <node concept="Xl_RD" id="3GEs5q_3Qp$" role="37wK5m">
-                        <property role="Xl_RC" value="reporting" />
-                      </node>
-                      <node concept="3VsKOn" id="3GEs5q_3JtQ" role="37wK5m">
-                        <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="oI9YrdpMV" role="2OqNvi">
-                  <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
-                  <node concept="10Nm6u" id="oI9YrdpSj" role="37wK5m">
-                    <node concept="29HgVG" id="oI9Yrdq5a" role="lGtFl">
-                      <node concept="3NFfHV" id="oI9Yrdq6g" role="3NFExx">
-                        <node concept="3clFbS" id="oI9Yrdq6h" role="2VODD2">
-                          <node concept="3clFbF" id="oI9Yrdqga" role="3cqZAp">
-                            <node concept="2OqwBi" id="oI9YrDiN5" role="3clFbG">
-                              <node concept="1PxgMI" id="oI9YrDis6" role="2Oq$k0">
-                                <property role="1BlNFB" value="true" />
-                                <node concept="chp4Y" id="oI9YrDiyk" role="3oSUPX">
-                                  <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
-                                </node>
-                                <node concept="2OqwBi" id="oI9YrdqqW" role="1m5AlR">
-                                  <node concept="30H73N" id="oI9Yrdqg9" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="oI9YrhRpO" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="oI9YrDjih" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="10Nm6u" id="oI9YrdpWG" role="37wK5m">
-                    <node concept="29HgVG" id="oI9YrdqWM" role="lGtFl">
-                      <node concept="3NFfHV" id="oI9Yrdr5Y" role="3NFExx">
-                        <node concept="3clFbS" id="oI9Yrdr5Z" role="2VODD2">
-                          <node concept="3clFbF" id="oI9Yrdrm8" role="3cqZAp">
-                            <node concept="2OqwBi" id="oI9YrdrAN" role="3clFbG">
-                              <node concept="1PxgMI" id="oI9YrhSPv" role="2Oq$k0">
-                                <node concept="chp4Y" id="oI9YrhSWB" role="3oSUPX">
-                                  <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                                </node>
-                                <node concept="2OqwBi" id="oI9YrhRJa" role="1m5AlR">
-                                  <node concept="30H73N" id="oI9Yrdrm7" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="oI9YrhSca" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="oI9YrhTh$" role="2OqNvi">
-                                <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="raruj" id="oI9Yrdq3d" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="oI9YrhOAg" role="30HLyM">
-        <node concept="3clFbS" id="oI9YrhOAh" role="2VODD2">
-          <node concept="3clFbF" id="oI9YrhOQs" role="3cqZAp">
-            <node concept="2OqwBi" id="oI9YrhPLM" role="3clFbG">
-              <node concept="2OqwBi" id="oI9YrhP4Z" role="2Oq$k0">
-                <node concept="30H73N" id="oI9YrhOQr" role="2Oq$k0" />
-                <node concept="3TrEf2" id="oI9YrhPmb" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="oI9YrhQ9K" role="2OqNvi">
-                <node concept="chp4Y" id="oI9YrhQl5" role="cj9EA">
-                  <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="oI9YrWegi" role="3acgRq">
-      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
-      <node concept="14YyZ8" id="oI9YrWeEj" role="1lVwrX">
-        <node concept="14ZrTv" id="oI9YrWeRH" role="14ZwWg">
-          <node concept="30G5F_" id="oI9YrWeRI" role="150hEN">
-            <node concept="3clFbS" id="oI9YrWeRJ" role="2VODD2">
-              <node concept="3clFbF" id="oI9YrWgo$" role="3cqZAp">
-                <node concept="2OqwBi" id="oI9YrWhEN" role="3clFbG">
-                  <node concept="2OqwBi" id="oI9YrWgB7" role="2Oq$k0">
-                    <node concept="2Xjw5R" id="oI9YrWh21" role="2OqNvi">
-                      <node concept="3gmYPX" id="oI9YrWhba" role="1xVPHs">
-                        <node concept="3gn64h" id="oI9YrWhnj" role="3gmYPZ">
-                          <ref role="3gnhBz" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="oI9Ys7DNw" role="2Oq$k0">
-                      <node concept="1iwH7S" id="oI9Ys7DNx" role="2Oq$k0" />
-                      <node concept="12$id9" id="oI9Ys7DNy" role="2OqNvi">
-                        <node concept="30H73N" id="oI9Ys7DNz" role="12$y8L" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="oI9YrWi3M" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="oI9YrWf2l" role="150oIE">
-            <node concept="3clFb_" id="oI9YrWf2m" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="oI9YrWf2n" role="1B3o_S" />
-              <node concept="3cqZAl" id="oI9YrWf2o" role="3clF45" />
-              <node concept="3clFbS" id="oI9YrWf2p" role="3clF47">
-                <node concept="3clFbF" id="oI9YrWf2q" role="3cqZAp">
-                  <node concept="2OqwBi" id="oI9YrWf2r" role="3clFbG">
-                    <node concept="liA8E" id="oI9YrWf2y" role="2OqNvi">
-                      <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
-                      <node concept="10Nm6u" id="oI9YrWf2z" role="37wK5m">
-                        <node concept="29HgVG" id="oI9YrWf2$" role="lGtFl">
-                          <node concept="3NFfHV" id="oI9YrWf2_" role="3NFExx">
-                            <node concept="3clFbS" id="oI9YrWf2A" role="2VODD2">
-                              <node concept="3clFbF" id="oI9YrWf2B" role="3cqZAp">
-                                <node concept="2OqwBi" id="oI9YrWf2C" role="3clFbG">
-                                  <node concept="1PxgMI" id="oI9YrWf2D" role="2Oq$k0">
-                                    <property role="1BlNFB" value="true" />
-                                    <node concept="chp4Y" id="oI9YrWf2E" role="3oSUPX">
-                                      <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
-                                    </node>
-                                    <node concept="2OqwBi" id="oI9YrWf2F" role="1m5AlR">
-                                      <node concept="30H73N" id="oI9YrWf2G" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="oI9YrWf2H" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="oI9YrWf2I" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="10Nm6u" id="oI9YrWf2J" role="37wK5m">
-                        <node concept="29HgVG" id="oI9YrWf2K" role="lGtFl">
-                          <node concept="3NFfHV" id="oI9YrWf2L" role="3NFExx">
-                            <node concept="3clFbS" id="oI9YrWf2M" role="2VODD2">
-                              <node concept="3clFbF" id="oI9YrWf2N" role="3cqZAp">
-                                <node concept="2OqwBi" id="oI9YrWf2O" role="3clFbG">
-                                  <node concept="1PxgMI" id="oI9YrWf2P" role="2Oq$k0">
-                                    <node concept="chp4Y" id="oI9YrWf2Q" role="3oSUPX">
-                                      <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                                    </node>
-                                    <node concept="2OqwBi" id="oI9YrWf2R" role="1m5AlR">
-                                      <node concept="30H73N" id="oI9YrWf2S" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="oI9YrWf2T" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="oI9YrWf2U" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="raruj" id="oI9YrWf2V" role="lGtFl" />
-                    <node concept="2OqwBi" id="oI9YrWf2v" role="2Oq$k0">
-                      <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
-                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.current()" resolve="current" />
-                      </node>
-                      <node concept="liA8E" id="3GEs5q_4fTI" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.parameter(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$ParameterKey)" resolve="parameter" />
-                        <node concept="2YIFZM" id="3GEs5q_4fTJ" role="37wK5m">
-                          <ref role="1Pybhc" to="w7la:~EvaluationSession$ParameterKey" resolve="EvaluationSession.ParameterKey" />
-                          <ref role="37wK5l" to="w7la:~EvaluationSession$ParameterKey.of(java.lang.String,java.lang.Class)" resolve="of" />
-                          <node concept="Xl_RD" id="3GEs5q_4fTK" role="37wK5m">
-                            <property role="Xl_RC" value="reporting" />
-                          </node>
-                          <node concept="3VsKOn" id="3GEs5q_4fTL" role="37wK5m">
-                            <ref role="3VsUkX" to="9x2e:oI9YrIZeS" resolve="Reporting" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Koe21" id="oI9YrWidk" role="14YRTM">
-          <node concept="3clFb_" id="oI9YrWidl" role="1Koe22">
-            <property role="TrG5h" value="context" />
-            <node concept="37vLTG" id="oI9YrWqaC" role="3clF46">
-              <property role="TrG5h" value="session" />
-              <node concept="3uibUv" id="oI9YrWqaD" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-              </node>
-            </node>
-            <node concept="3Tm6S6" id="oI9YrWidm" role="1B3o_S" />
-            <node concept="3cqZAl" id="oI9YrWidn" role="3clF45" />
-            <node concept="3clFbS" id="oI9YrWido" role="3clF47">
-              <node concept="3clFbF" id="oI9YrWidp" role="3cqZAp">
-                <node concept="2OqwBi" id="oI9YrWidq" role="3clFbG">
-                  <node concept="2YIFZM" id="oI9YrWiD0" role="2Oq$k0">
-                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                    <ref role="37wK5l" to="9x2e:oI9YrJ1oq" resolve="application" />
-                    <node concept="37vLTw" id="oI9YrWqx1" role="37wK5m">
-                      <ref role="3cqZAo" node="oI9YrWqaC" resolve="session" />
-                      <node concept="1ZhdrF" id="oI9YrWqGh" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <property role="2qtEX8" value="variableDeclaration" />
-                        <node concept="3$xsQk" id="oI9YrWqGi" role="3$ytzL">
-                          <node concept="3clFbS" id="oI9YrWqGj" role="2VODD2">
-                            <node concept="3clFbF" id="oI9YrWsWU" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9YrWsWV" role="3clFbG">
-                                <node concept="1iwH7S" id="oI9YrWsWW" role="2Oq$k0" />
-                                <node concept="1iwH70" id="oI9YrWsWX" role="2OqNvi">
-                                  <ref role="1iwH77" to="ogv8:429xoypVg6q" resolve="apply_session_parameter" />
-                                  <node concept="2OqwBi" id="oI9YrWsWY" role="1iwH7V">
-                                    <node concept="30H73N" id="oI9YrWsWZ" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="oI9YrWsX0" role="2OqNvi">
-                                      <node concept="1xMEDy" id="oI9YrWsX1" role="1xVPHs">
-                                        <node concept="chp4Y" id="oI9YrWsX2" role="ri$Ld">
-                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="oI9YrWidv" role="2OqNvi">
-                    <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
-                    <node concept="10Nm6u" id="oI9YrWidw" role="37wK5m">
-                      <node concept="29HgVG" id="oI9YrWidx" role="lGtFl">
-                        <node concept="3NFfHV" id="oI9YrWidy" role="3NFExx">
-                          <node concept="3clFbS" id="oI9YrWidz" role="2VODD2">
-                            <node concept="3clFbF" id="oI9YrWid$" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9YrWid_" role="3clFbG">
-                                <node concept="1PxgMI" id="oI9YrWidA" role="2Oq$k0">
-                                  <property role="1BlNFB" value="true" />
-                                  <node concept="chp4Y" id="oI9YrWidB" role="3oSUPX">
-                                    <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
-                                  </node>
-                                  <node concept="2OqwBi" id="oI9YrWidC" role="1m5AlR">
-                                    <node concept="30H73N" id="oI9YrWidD" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="oI9YrWidE" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="oI9YrWidF" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="10Nm6u" id="oI9YrWidG" role="37wK5m">
-                      <node concept="29HgVG" id="oI9YrWidH" role="lGtFl">
-                        <node concept="3NFfHV" id="oI9YrWidI" role="3NFExx">
-                          <node concept="3clFbS" id="oI9YrWidJ" role="2VODD2">
-                            <node concept="3clFbF" id="oI9YrWidK" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9YrWidL" role="3clFbG">
-                                <node concept="1PxgMI" id="oI9YrWidM" role="2Oq$k0">
-                                  <node concept="chp4Y" id="oI9YrWidN" role="3oSUPX">
-                                    <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                                  </node>
-                                  <node concept="2OqwBi" id="oI9YrWidO" role="1m5AlR">
-                                    <node concept="30H73N" id="oI9YrWidP" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="oI9YrWidQ" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="oI9YrWidR" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="oI9YrWidS" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="oI9YrWegU" role="30HLyM">
-        <node concept="3clFbS" id="oI9YrWegV" role="2VODD2">
-          <node concept="3clFbF" id="oI9YrWegW" role="3cqZAp">
-            <node concept="2OqwBi" id="oI9YrWegX" role="3clFbG">
-              <node concept="2OqwBi" id="oI9YrWegY" role="2Oq$k0">
-                <node concept="30H73N" id="oI9YrWegZ" role="2Oq$k0" />
-                <node concept="3TrEf2" id="oI9YrWeh0" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="oI9YrWeh1" role="2OqNvi">
-                <node concept="chp4Y" id="oI9YrWeh2" role="cj9EA">
-                  <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
index 568bc525..a5c27912 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
@@ -10,71 +10,6 @@
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
     <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
   </imports>
-  <registry>
-    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
-      <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
-        <reference id="1225194240799" name="concept" index="13h7C2" />
-        <child id="1225194240805" name="method" index="13h7CS" />
-        <child id="1225194240801" name="constructor" index="13h7CW" />
-      </concept>
-      <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
-      <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
-        <property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
-        <property id="1225194472832" name="isVirtual" index="13i0it" />
-        <property id="1225194472834" name="isAbstract" index="13i0iv" />
-        <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
-      </concept>
-    </language>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <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">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="13h7C7" id="oI9Yrc9CS">
-    <ref role="13h7C2" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    <node concept="13hLZK" id="oI9Yrc9CT" role="13h7CW">
-      <node concept="3clFbS" id="oI9Yrc9CU" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="oI9Yrc9Fs" role="13h7CS">
-      <property role="2Ki8OM" value="true" />
-      <property role="TrG5h" value="applicableToNode" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <ref role="13i0hy" to="tpeu:1653mnvAgrs" resolve="applicableToNode" />
-      <node concept="3Tm1VV" id="oI9Yrc9Ft" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9Yrc9Fy" role="3clF47">
-        <node concept="3clFbF" id="oI9Yrc9L5" role="3cqZAp">
-          <node concept="3clFbT" id="oI9Yrc9L4" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="oI9Yrc9Fz" role="3clF45" />
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
index c5931615..2e76f668 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
@@ -9,82 +9,6 @@
   <imports>
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <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">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="1350122676458893092" name="text" index="3ndbpf" />
-      </concept>
-    </language>
-    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
-      <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
-      <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
-        <reference id="1213093996982" name="concept" index="1M2myG" />
-        <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
-      </concept>
-    </language>
-    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
-      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
-        <property id="155656958578482949" name="value" index="3oM_SC" />
-      </concept>
-      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="ng" index="1PaTwC">
-        <child id="2535923850359271783" name="elements" index="1PaTwD" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="1M2fIO" id="oI9Yr_Dyq">
-    <ref role="1M2myG" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    <node concept="9S07l" id="oI9Yr_Dyr" role="9Vyp8">
-      <node concept="3clFbS" id="oI9Yr_Dys" role="2VODD2">
-        <node concept="3SKdUt" id="3IIf9O_Dsc2" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYwyo" role="3ndbpf">
-            <node concept="3oM_SD" id="589APehYwyp" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME:" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwyq" role="1PaTwD">
-              <property role="3oM_SC" value="better" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwyr" role="1PaTwD">
-              <property role="3oM_SC" value="control" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwys" role="1PaTwD">
-              <property role="3oM_SC" value="over" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwyt" role="1PaTwD">
-              <property role="3oM_SC" value="where" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwyu" role="1PaTwD">
-              <property role="3oM_SC" value="this" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwyv" role="1PaTwD">
-              <property role="3oM_SC" value="should" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwyw" role="1PaTwD">
-              <property role="3oM_SC" value="be" />
-            </node>
-            <node concept="3oM_SD" id="589APehYwyx" role="1PaTwD">
-              <property role="3oM_SC" value="available" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9O_DsqD" role="3cqZAp">
-          <node concept="3clFbT" id="3IIf9O_DsqC" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
index d7e3daaa..76b2b2a2 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
@@ -10,54 +10,6 @@
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
   </imports>
-  <registry>
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
-      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
-      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
-      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
-        <child id="1080736633877" name="cellModel" index="2wV5jI" />
-      </concept>
-      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
-        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
-      </concept>
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
-        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
-      </concept>
-      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
-        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
-      </concept>
-      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
-        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
-        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
-      </concept>
-      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
-        <property id="1073389577007" name="text" index="3F0ifm" />
-      </concept>
-      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
-      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
-        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="24kQdi" id="oI9Yrc9_k">
-    <ref role="1XX52x" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    <node concept="3EZMnI" id="oI9Yrc9BJ" role="2wV5jI">
-      <node concept="PMmxH" id="oI9Yrc9BQ" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0ifn" id="oI9Yrc9BZ" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
-      <node concept="3F1sOY" id="oI9Yrc9Cp" role="3EZMnx">
-        <ref role="1NtTu8" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
-      </node>
-      <node concept="3F0ifn" id="oI9Yrc9C7" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-      </node>
-      <node concept="l2Vlx" id="oI9Yrc9BM" role="2iSdaV" />
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index 2897f245..8d0f5b21 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -9,47 +9,6 @@
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
   </imports>
-  <registry>
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
-      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
-        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
-        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
-        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
-      </concept>
-      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
-        <reference id="1071489389519" name="extends" index="1TJDcQ" />
-      </concept>
-      <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
-        <property id="1071599776563" name="role" index="20kJfa" />
-        <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
-        <property id="1071599937831" name="metaClass" index="20lmBu" />
-        <property id="241647608299431140" name="linkId" index="IQ2ns" />
-        <reference id="1071599976176" name="target" index="20lvS9" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="1TIwiD" id="oI9Yrc9wC">
-    <property role="EcuMT" value="6958395084019752" />
-    <property role="TrG5h" value="SNodeSetTypeOperation" />
-    <property role="34LRSv" value="set" />
-    <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
-    <node concept="1TJgyj" id="oI9Yrc9Ch" role="1TKVEi">
-      <property role="IQ2ns" value="6958395084020241" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="typeExpr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="asaX9" id="7gOEBI$s8Uu" role="lGtFl" />
-  </node>
+  <registry />
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
index f99c19fc..3f7b4401 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
@@ -11,102 +11,6 @@
   <imports>
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <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" />
-      </concept>
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-    </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
-    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
-      <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
-        <child id="1185788644032" name="normalType" index="mwGJk" />
-      </concept>
-      <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
-        <child id="1195213635060" name="body" index="18ibNy" />
-      </concept>
-      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
-        <reference id="1174642800329" name="concept" index="1YaFvo" />
-      </concept>
-      <concept id="1174643105530" name="jetbrains.mps.lang.typesystem.structure.InferenceRule" flags="ig" index="1YbPZF" />
-      <concept id="1174648085619" name="jetbrains.mps.lang.typesystem.structure.AbstractRule" flags="ng" index="1YuPPy">
-        <child id="1174648101952" name="applicableNode" index="1YuTPh" />
-      </concept>
-      <concept id="1174650418652" name="jetbrains.mps.lang.typesystem.structure.ApplicableNodeReference" flags="nn" index="1YBJjd">
-        <reference id="1174650432090" name="applicableNode" index="1YBMHb" />
-      </concept>
-      <concept id="1174657487114" name="jetbrains.mps.lang.typesystem.structure.TypeOfExpression" flags="nn" index="1Z2H0r">
-        <child id="1174657509053" name="term" index="1Z2MuG" />
-      </concept>
-      <concept id="1174658326157" name="jetbrains.mps.lang.typesystem.structure.CreateEquationStatement" flags="nn" index="1Z5TYs" />
-      <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
-        <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
-        <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
-      </concept>
-      <concept id="1174663118805" name="jetbrains.mps.lang.typesystem.structure.CreateLessThanInequationStatement" flags="nn" index="1ZobV4" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="1YbPZF" id="oI9Yrc9SS">
-    <property role="TrG5h" value="typeof_SNodeAssignTypeOperation" />
-    <node concept="3clFbS" id="oI9Yrc9ST" role="18ibNy">
-      <node concept="1Z5TYs" id="oI9Yrca4p" role="3cqZAp">
-        <node concept="mw_s8" id="oI9Yrca4H" role="1ZfhKB">
-          <node concept="2c44tf" id="oI9Yrca4D" role="mwGJk">
-            <node concept="10P_77" id="oI9Yrca5G" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="oI9Yrca4s" role="1ZfhK$">
-          <node concept="1Z2H0r" id="oI9Yrc9Vt" role="mwGJk">
-            <node concept="1YBJjd" id="oI9Yrc9Xf" role="1Z2MuG">
-              <ref role="1YBMHb" node="oI9Yrc9SV" resolve="ato" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1ZobV4" id="oI9YrcaYJ" role="3cqZAp">
-        <node concept="mw_s8" id="oI9YrcaZ_" role="1ZfhKB">
-          <node concept="2c44tf" id="oI9YrcaZx" role="mwGJk">
-            <node concept="3Tqbb2" id="oI9Yrcb3x" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="oI9YrcaYM" role="1ZfhK$">
-          <node concept="1Z2H0r" id="oI9Yrca6M" role="mwGJk">
-            <node concept="2OqwBi" id="oI9YrcahM" role="1Z2MuG">
-              <node concept="1YBJjd" id="oI9Yrca8F" role="2Oq$k0">
-                <ref role="1YBMHb" node="oI9Yrc9SV" resolve="ato" />
-              </node>
-              <node concept="3TrEf2" id="oI9Yrcat9" role="2OqNvi">
-                <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="oI9Yrc9SV" role="1YuTPh">
-      <property role="TrG5h" value="ato" />
-      <ref role="1YaFvo" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    </node>
-  </node>
+  <registry />
 </model>