diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 17e76609..7abd9e11 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -3926,7 +3926,15 @@
         <node concept="pkWqt" id="vp2bUKtZz8" role="pqm2j">
           <node concept="3clFbS" id="vp2bUKtZz9" role="2VODD2">
             <node concept="3clFbF" id="vp2bUKu01z" role="3cqZAp">
-              <node concept="3clFbT" id="vp2bUKu01y" role="3clFbG" />
+              <node concept="3y3z36" id="3swcsd3jKXx" role="3clFbG">
+                <node concept="10Nm6u" id="3swcsd3jKYB" role="3uHU7w" />
+                <node concept="2OqwBi" id="3swcsd3jJx3" role="3uHU7B">
+                  <node concept="pncrf" id="3swcsd3jJ2J" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3swcsd3jKdE" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -6394,15 +6402,6 @@
       <ref role="3XGfJA" to="wq2x:5itBwM5mdnH" resolve="declaration" />
     </node>
   </node>
-  <node concept="22mcaB" id="7L5omgeruEi">
-    <ref role="aqKnT" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
-    <node concept="22hDWg" id="2TBKtozZDV1" role="22hAXT">
-      <property role="TrG5h" value="ExpandMacroPrototype_SmartReference" />
-    </node>
-    <node concept="3XHNnq" id="7L5omgeruEh" role="3ft7WO">
-      <ref role="3XGfJA" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
-    </node>
-  </node>
   <node concept="22mcaB" id="4hPXq9Jmem8">
     <ref role="aqKnT" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
     <node concept="22hDWj" id="2TBKtozZDV2" role="22hAXT" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index 2155e8eb..57bf516c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -44,6 +44,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="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -1229,5 +1230,50 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="3swcsd3lxTT">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="DropApplicableConcept" />
+    <property role="2ZfUl3" value="true" />
+    <ref role="2ZfgGC" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
+    <node concept="2S6ZIM" id="3swcsd3lxTU" role="2ZfVej">
+      <node concept="3clFbS" id="3swcsd3lxTV" role="2VODD2">
+        <node concept="3clFbF" id="3swcsd3lyaO" role="3cqZAp">
+          <node concept="Xl_RD" id="3swcsd3lyaN" role="3clFbG">
+            <property role="Xl_RC" value="Drop Deprecated ApplicableConcept Reference" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="3swcsd3lxTW" role="2ZfgGD">
+      <node concept="3clFbS" id="3swcsd3lxTX" role="2VODD2">
+        <node concept="3clFbF" id="3swcsd3l$ds" role="3cqZAp">
+          <node concept="37vLTI" id="3swcsd3l_LM" role="3clFbG">
+            <node concept="10Nm6u" id="3swcsd3l_Ml" role="37vLTx" />
+            <node concept="2OqwBi" id="3swcsd3l$dK" role="37vLTJ">
+              <node concept="2Sf5sV" id="3swcsd3l$dr" role="2Oq$k0" />
+              <node concept="3TrEf2" id="3swcsd3l$gt" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="3swcsd3lyLg" role="2ZfVeh">
+      <node concept="3clFbS" id="3swcsd3lyLh" role="2VODD2">
+        <node concept="3clFbF" id="3swcsd3lyZn" role="3cqZAp">
+          <node concept="3y3z36" id="3swcsd3l$2N" role="3clFbG">
+            <node concept="10Nm6u" id="3swcsd3l$c0" role="3uHU7w" />
+            <node concept="2OqwBi" id="3swcsd3lzrs" role="3uHU7B">
+              <node concept="2Sf5sV" id="3swcsd3lyZm" role="2Oq$k0" />
+              <node concept="3TrEf2" id="3swcsd3lzH9" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 65db8bcf..b517f932 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1234,7 +1234,6 @@
     <node concept="1TJgyj" id="5itBwM6dfdw" role="1TKVEi">
       <property role="IQ2ns" value="6097203247157932896" />
       <property role="20kJfa" value="applicableConcept" />
-      <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
       <node concept="asaX9" id="vp2bUKvt3$" role="lGtFl" />
     </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index c0c674d1..2ecf6074 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -1657,24 +1657,6 @@
                       </node>
                       <node concept="ns1u0" id="61G6TdBIz7U" role="3AunhB">
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
-                        <node concept="nsMwS" id="61G6TdBIz7X" role="ns1xD">
-                          <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2Lvh" role="iSaTp">
-                            <node concept="2OqwBi" id="61G6TdBI$iz" role="37jj2">
-                              <node concept="2OqwBi" id="61G6TdBIzVt" role="2Oq$k0">
-                                <node concept="3A2sRY" id="61G6TdBIzSj" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
-                                </node>
-                                <node concept="3TrEf2" id="61G6TdBI$8l" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="61G6TdBI$zP" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1692,24 +1674,6 @@
                       </node>
                       <node concept="ns1u0" id="7FV1iGvKQTy" role="3AunhB">
                         <ref role="ns1xF" to="jxwi:3bgqfmmKxBI" resolve="concept" />
-                        <node concept="nsMwS" id="7FV1iGvKQTz" role="ns1xD">
-                          <ref role="nsMwP" to="jxwi:3lXUvG03UmI" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2Lvi" role="iSaTp">
-                            <node concept="2OqwBi" id="7FV1iGvKQT$" role="37jj2">
-                              <node concept="2OqwBi" id="7FV1iGvKQT_" role="2Oq$k0">
-                                <node concept="3A2sRY" id="7FV1iGvKQTA" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
-                                </node>
-                                <node concept="3TrEf2" id="7FV1iGvKQTB" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7FV1iGvKQTC" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1730,16 +1694,6 @@
     <node concept="1nLNMY" id="51ek2rSd73p" role="1nK1Vg">
       <property role="TrG5h" value="expandMacroTemplate" />
       <node concept="3clFbS" id="51ek2rSd73q" role="1nLNMH">
-        <node concept="1mebxG" id="51ek2rSdfRQ" role="3cqZAp">
-          <node concept="2OqwBi" id="51ek2rSdlbh" role="1mebXD">
-            <node concept="3A2sRY" id="51ek2rSdkYP" role="2Oq$k0">
-              <ref role="3A2yKK" node="51ek2rSd73s" resolve="emt" />
-            </node>
-            <node concept="3TrEf2" id="51ek2rSdlvh" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
-            </node>
-          </node>
-        </node>
         <node concept="Oftf1" id="51ek2rSdfS3" role="3cqZAp">
           <node concept="2OqwBi" id="51ek2rSdilu" role="Oftjs">
             <node concept="2OqwBi" id="51ek2rSdg4z" role="2Oq$k0">