diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index e9819b93..1b170d68 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -4978,57 +4978,6 @@
   <node concept="IW6AY" id="xaaVXv4Ni3">
     <property role="3GE5qa" value="rule" />
     <ref role="aqKnT" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-    <node concept="1Qtc8_" id="xaaVXv4Ni4" role="IW6Ez">
-      <node concept="IWgqT" id="xaaVXv4Nig" role="1Qtc8A">
-        <node concept="1hCUdq" id="xaaVXv4Nii" role="1hCUd6">
-          <node concept="3clFbS" id="xaaVXv4Nik" role="2VODD2">
-            <node concept="3clFbF" id="xaaVXv4NiB" role="3cqZAp">
-              <node concept="Xl_RD" id="xaaVXv4NiA" role="3clFbG">
-                <property role="Xl_RC" value="principal" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWg2L" id="xaaVXv4Nim" role="IWgqQ">
-          <node concept="3clFbS" id="xaaVXv4Nio" role="2VODD2">
-            <node concept="3clFbF" id="xaaVXv4OmQ" role="3cqZAp">
-              <node concept="2OqwBi" id="xaaVXv4PEE" role="3clFbG">
-                <node concept="2OqwBi" id="xaaVXv4O_a" role="2Oq$k0">
-                  <node concept="7Obwk" id="xaaVXv4OmP" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="xaaVXv4P7T" role="2OqNvi">
-                    <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
-                  </node>
-                </node>
-                <node concept="tyxLq" id="xaaVXv4Q80" role="2OqNvi">
-                  <node concept="3clFbT" id="xaaVXv4Q9F" role="tz02z">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="27VH4U" id="xaaVXv4NiI" role="2jiSrf">
-          <node concept="3clFbS" id="xaaVXv4NiJ" role="2VODD2">
-            <node concept="3clFbF" id="xaaVXv4NjP" role="3cqZAp">
-              <node concept="3fqX7Q" id="xaaVXv4Om_" role="3clFbG">
-                <node concept="2OqwBi" id="xaaVXv4OmB" role="3fr31v">
-                  <node concept="7Obwk" id="xaaVXv4OmC" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="xaaVXv4OmD" role="2OqNvi">
-                    <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3cWJ9i" id="xaaVXv4Ni8" role="1Qtc8$">
-        <node concept="CtIbL" id="xaaVXv4Nia" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="325Ffw" id="xaaVXv4Rfc">
     <property role="3GE5qa" value="rule" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index b2805821..7d6e7cb8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -973,6 +973,7 @@
       <property role="IQ2nx" value="597338001513854136" />
       <property role="TrG5h" value="principal" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+      <node concept="asaX9" id="6E2cNicXaKy" role="lGtFl" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIsx" role="1TKVEi">
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index a01f7dbe..3527922c 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -925,6 +925,9 @@
       <node concept="10P_77" id="xaaVXv6LX8" role="3clF45" />
       <node concept="3Tm1VV" id="xaaVXv6GSo" role="1B3o_S" />
       <node concept="3clFbS" id="xaaVXv6GSp" role="3clF47" />
+      <node concept="2AHcQZ" id="6E2cNicW82Y" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
     </node>
     <node concept="2tJIrI" id="67SsWaEmb4N" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUndvp" role="jymVt">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index b3c67055..0bf91afb 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -282,7 +282,6 @@
         <child id="7674753015762572651" name="body" index="3xSepv" />
       </concept>
       <concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
-        <property id="597338001513854136" name="principal" index="1nmhW7" />
         <child id="3575255234175001641" name="condition" index="1nLFYo" />
         <child id="3575255234174969633" name="input" index="1nLNMg" />
         <child id="3575255234174969628" name="code" index="1nLNMH" />
@@ -382,7 +381,6 @@
     <property role="TrG5h" value="Reachability" />
     <node concept="1nLNMY" id="6Yb9hAqKtVm" role="1nK1Vg">
       <property role="TrG5h" value="methodDeclaration" />
-      <property role="1nmhW7" value="true" />
       <node concept="3clFbS" id="6Yb9hAqKtVn" role="1nLNMH">
         <node concept="3clFbJ" id="6Yb9hAqKJAR" role="3cqZAp">
           <node concept="3clFbS" id="6Yb9hAqKJAT" role="3clFbx">
@@ -5511,7 +5509,6 @@
     <ref role="2YbDB9" node="78H58oerI5G" resolve="Reachability" />
     <node concept="1nLNMY" id="22$xxOvW8oO" role="1nK1Vg">
       <property role="TrG5h" value="visitMethodDeclaration" />
-      <property role="1nmhW7" value="true" />
       <node concept="3clFbS" id="22$xxOvW8oP" role="1nLNMH">
         <node concept="3clFbJ" id="22$xxOvW8oQ" role="3cqZAp">
           <node concept="3clFbS" id="22$xxOvW8oR" role="3clFbx">