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 6d2c81d4..84e90e27 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
@@ -15103,7 +15103,7 @@
               <node concept="3cpWs6" id="5hSMZ_lNZhv" role="3cqZAp">
                 <node concept="10Nm6u" id="5hSMZ_lNZhw" role="3cqZAk">
                   <node concept="1sPUBX" id="5hSMZ_lNZhx" role="lGtFl">
-                    <ref role="v9R2y" node="JOGAOsGlpT" resolve="term_pattern" />
+                    <ref role="v9R2y" node="1CcQBrPQape" resolve="term_pattern_feature" />
                   </node>
                 </node>
               </node>
@@ -16591,41 +16591,6 @@
       </node>
     </node>
   </node>
-  <node concept="jVnub" id="JOGAOsGlpT">
-    <property role="TrG5h" value="term_pattern" />
-    <property role="3GE5qa" value="term" />
-    <node concept="3aamgX" id="JOGAOsGlpV" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
-      <node concept="gft3U" id="JOGAOsGmnd" role="1lVwrX">
-        <node concept="1oi5Wm" id="JOGAOsGmwQ" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="1sPUBX" id="JOGAOsGmwU" role="lGtFl">
-            <ref role="v9R2y" node="1L74NXFa1BL" resolve="term_getter" />
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="JOGAOsGlpZ" role="30HLyM">
-        <node concept="3clFbS" id="JOGAOsGlq0" role="2VODD2">
-          <node concept="3clFbF" id="JOGAOsGlxj" role="3cqZAp">
-            <node concept="2OqwBi" id="JOGAOsGlJj" role="3clFbG">
-              <node concept="30H73N" id="JOGAOsGlxi" role="2Oq$k0" />
-              <node concept="3TrcHB" id="JOGAOsGma1" role="2OqNvi">
-                <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="gft3U" id="JOGAOsGmwX" role="jxRDz">
-      <node concept="10Nm6u" id="JOGAOsGmE$" role="gfFT$">
-        <node concept="1sPUBX" id="JOGAOsGmEI" role="lGtFl">
-          <ref role="v9R2y" node="1CcQBrPQape" resolve="term_pattern_feature" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="jVnub" id="1CcQBrPQape">
     <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="term_pattern_feature" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index ec9d9349..4f19e2d1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -4125,23 +4125,6 @@
     <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
     <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
-      <node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
-        <property role="3F0ifm" value="final" />
-        <ref role="1ERwB7" node="JOGAOsxj5_" resolve="DataFormFeature_final" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="pkWqt" id="1CcQBrPqjRc" role="pqm2j">
-          <node concept="3clFbS" id="1CcQBrPqjRd" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqjYq" role="3cqZAp">
-              <node concept="2OqwBi" id="1CcQBrPqkc9" role="3clFbG">
-                <node concept="pncrf" id="1CcQBrPqjYp" role="2Oq$k0" />
-                <node concept="3TrcHB" id="1CcQBrPqkxi" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="l2Vlx" id="1CcQBrPqjR5" role="2iSdaV" />
       <node concept="PMmxH" id="JOGAOsx_Cg" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
@@ -4182,45 +4165,6 @@
       </node>
     </node>
   </node>
-  <node concept="1h_SRR" id="JOGAOsxj5_">
-    <property role="TrG5h" value="DataFormFeature_final" />
-    <property role="3GE5qa" value="term.feature" />
-    <ref role="1h_SK9" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
-    <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
-      <node concept="1hAIg9" id="1CcQBrPqIC6" role="1hA7z_">
-        <node concept="3clFbS" id="1CcQBrPqIC7" role="2VODD2">
-          <node concept="3clFbF" id="1CcQBrPqJok" role="3cqZAp">
-            <node concept="2OqwBi" id="1CcQBrPqK8t" role="3clFbG">
-              <node concept="2OqwBi" id="1CcQBrPqJwy" role="2Oq$k0">
-                <node concept="0IXxy" id="1CcQBrPqJoj" role="2Oq$k0" />
-                <node concept="3TrcHB" id="1CcQBrPqJF6" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
-                </node>
-              </node>
-              <node concept="tyxLq" id="1CcQBrPqKmJ" role="2OqNvi">
-                <node concept="3clFbT" id="1CcQBrPqKpf" role="tz02z">
-                  <property role="3clFbU" value="false" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="jK8Ss" id="1CcQBrPqICj" role="jK8aL">
-        <node concept="3clFbS" id="1CcQBrPqICk" role="2VODD2">
-          <node concept="3clFbF" id="1CcQBrPqIJx" role="3cqZAp">
-            <node concept="2OqwBi" id="1CcQBrPqIXg" role="3clFbG">
-              <node concept="0IXxy" id="1CcQBrPqIJw" role="2Oq$k0" />
-              <node concept="3TrcHB" id="1CcQBrPqJeO" role="2OqNvi">
-                <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="JOGAOsxTDr">
     <property role="3GE5qa" value="term.feature" />
     <ref role="1XX52x" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
@@ -5977,57 +5921,6 @@
   <node concept="3ICUPy" id="JOGAOsxkwf">
     <ref role="aqKnT" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
     <node concept="22hDWj" id="2TBKtozZDUT" role="22hAXT" />
-    <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
-      <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
-        <node concept="CtIbL" id="1CcQBrPqlWV" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
-        </node>
-      </node>
-      <node concept="IWgqT" id="1CcQBrPqlWZ" role="1Qtc8A">
-        <node concept="1hCUdq" id="1CcQBrPqlX0" role="1hCUd6">
-          <node concept="3clFbS" id="1CcQBrPqlX1" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqm5F" role="3cqZAp">
-              <node concept="Xl_RD" id="1CcQBrPqm5E" role="3clFbG">
-                <property role="Xl_RC" value="final" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWg2L" id="1CcQBrPqlX2" role="IWgqQ">
-          <node concept="3clFbS" id="1CcQBrPqlX3" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqnP6" role="3cqZAp">
-              <node concept="2OqwBi" id="1CcQBrPqoCB" role="3clFbG">
-                <node concept="2OqwBi" id="1CcQBrPqnXk" role="2Oq$k0">
-                  <node concept="7Obwk" id="1CcQBrPqnP5" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="1CcQBrPqo7Q" role="2OqNvi">
-                    <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
-                  </node>
-                </node>
-                <node concept="tyxLq" id="1CcQBrPqoQT" role="2OqNvi">
-                  <node concept="3clFbT" id="1CcQBrPqoUG" role="tz02z">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="27VH4U" id="1CcQBrPqmmK" role="2jiSrf">
-          <node concept="3clFbS" id="1CcQBrPqmmL" role="2VODD2">
-            <node concept="3clFbF" id="1CcQBrPqmu4" role="3cqZAp">
-              <node concept="3fqX7Q" id="1CcQBrPqnFp" role="3clFbG">
-                <node concept="2OqwBi" id="1CcQBrPqnFr" role="3fr31v">
-                  <node concept="7Obwk" id="1CcQBrPqnFs" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="1CcQBrPqnFt" role="2OqNvi">
-                    <ref role="3TsBF5" to="wq2x:JOGAOsxiLC" resolve="final" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="1Qtc8_" id="JOGAOsxAMn" role="IW6Ez">
       <node concept="3cWJ9i" id="JOGAOsxAMo" role="1Qtc8$">
         <node concept="CtIbL" id="JOGAOsxAMp" role="CtIbM">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index bef806f3..93431a1a 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1383,11 +1383,6 @@
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="term.feature" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyi" id="JOGAOsxiLC" role="1TKVEl">
-      <property role="IQ2nx" value="861509610434276456" />
-      <property role="TrG5h" value="final" />
-      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-    </node>
     <node concept="PrWs8" id="JOGAOsxiLA" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>