diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index c3b9fc0e..bf1268b5 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -171,9 +171,6 @@
       <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
       <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
@@ -1247,7 +1244,6 @@
         </node>
         <node concept="nssqF" id="JOGAOsVt6$" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 1eea444f..4c634418 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -208,9 +208,6 @@
       <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
       <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
@@ -2110,11 +2107,9 @@
       <node concept="nspSf" id="7VBaGntKJ6D" role="ns1xx">
         <node concept="nstbe" id="7VBaGntKJ6E" role="nspSe">
           <property role="TrG5h" value="left" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="7VBaGntKJ6F" role="nspSe">
           <property role="TrG5h" value="right" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 9f8d5007..a2be9d46 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -282,9 +282,6 @@
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
       <concept id="861509610434305888" name="jetbrains.mps.lang.coderules.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
       <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
@@ -3448,11 +3445,9 @@
       <node concept="nspSf" id="7VBaGntKJ6R" role="ns1xx">
         <node concept="nstbe" id="7VBaGntKJ6S" role="nspSe">
           <property role="TrG5h" value="variable" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="7VBaGntKJ6T" role="nspSe">
           <property role="TrG5h" value="sentence" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -3461,11 +3456,9 @@
       <node concept="nspSf" id="7VBaGntKJ6V" role="ns1xx">
         <node concept="nstbe" id="7VBaGntKJ6W" role="nspSe">
           <property role="TrG5h" value="variable" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="7VBaGntKJ6X" role="nspSe">
           <property role="TrG5h" value="sentence" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -3474,11 +3467,9 @@
       <node concept="nspSf" id="7VBaGntKJ6Z" role="ns1xx">
         <node concept="nssqF" id="7VBaGntKJ70" role="nspSe">
           <property role="TrG5h" value="name" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nsiOd" id="7VBaGntKJ71" role="nspSe">
           <property role="TrG5h" value="member" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -3487,7 +3478,6 @@
       <node concept="nspSf" id="7VBaGntKJ73" role="ns1xx">
         <node concept="nssqF" id="7VBaGntKJ74" role="nspSe">
           <property role="TrG5h" value="name" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -3496,7 +3486,6 @@
       <node concept="nspSf" id="7VBaGntKJ76" role="ns1xx">
         <node concept="nssqF" id="7VBaGntKJ77" role="nspSe">
           <property role="TrG5h" value="name" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -3505,11 +3494,9 @@
       <node concept="nspSf" id="7VBaGntKJ79" role="ns1xx">
         <node concept="nssqF" id="7VBaGntKJ7a" role="nspSe">
           <property role="TrG5h" value="name" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nsiOd" id="7VBaGntKJ7b" role="nspSe">
           <property role="TrG5h" value="argument" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index bc8c3544..b124734f 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -166,9 +166,6 @@
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
       <concept id="861509610434305888" name="jetbrains.mps.lang.coderules.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
       <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
@@ -5209,7 +5206,6 @@
       <node concept="nspSf" id="7VBaGntKJ7Y" role="ns1xx">
         <node concept="nssqF" id="7VBaGntKJ7Z" role="nspSe">
           <property role="TrG5h" value="name" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -5218,7 +5214,6 @@
       <node concept="nspSf" id="7VBaGntKJ81" role="ns1xx">
         <node concept="nsiOd" id="7VBaGntKJ82" role="nspSe">
           <property role="TrG5h" value="conjuncts" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -5227,7 +5222,6 @@
       <node concept="nspSf" id="7VBaGntKJ84" role="ns1xx">
         <node concept="nsiOd" id="7VBaGntKJ85" role="nspSe">
           <property role="TrG5h" value="disjuncts" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -5236,7 +5230,6 @@
       <node concept="nspSf" id="7VBaGntKJ87" role="ns1xx">
         <node concept="nstbe" id="7VBaGntKJ88" role="nspSe">
           <property role="TrG5h" value="target" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -5245,11 +5238,9 @@
       <node concept="nspSf" id="7VBaGntKJ8a" role="ns1xx">
         <node concept="nstbe" id="7VBaGntKJ8b" role="nspSe">
           <property role="TrG5h" value="antecedent" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="7VBaGntKJ8c" role="nspSe">
           <property role="TrG5h" value="consequence" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -5258,11 +5249,9 @@
       <node concept="nspSf" id="7VBaGntKJ8e" role="ns1xx">
         <node concept="nstbe" id="7VBaGntKJ8f" role="nspSe">
           <property role="TrG5h" value="antecedent" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="7VBaGntKJ8g" role="nspSe">
           <property role="TrG5h" value="consequence" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 0f701ee4..669d2852 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -389,9 +389,6 @@
       <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
       <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
@@ -15830,11 +15827,9 @@
       <node concept="nspSf" id="7VBaGntJSG3" role="ns1xx">
         <node concept="nstbe" id="7VBaGntJSG4" role="nspSe">
           <property role="TrG5h" value="arg" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="7VBaGntJSG5" role="nspSe">
           <property role="TrG5h" value="res" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -15851,7 +15846,6 @@
       <node concept="nspSf" id="7VBaGntJSG7" role="ns1xx">
         <node concept="nstbe" id="7VBaGntJSG8" role="nspSe">
           <property role="TrG5h" value="type" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="39Sam6ZkwZq" role="nspSe">
           <property role="TrG5h" value="typeVars" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 55e53d1e..f16d3edb 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -703,9 +703,6 @@
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
       <concept id="861509610434305888" name="jetbrains.mps.lang.coderules.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="final" index="nspS5" />
-      </concept>
       <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
@@ -42159,11 +42156,9 @@
       <node concept="nspSf" id="JOGAOsVt2b" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt2c" role="nspSe">
           <property role="TrG5h" value="classifier" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nssqF" id="JOGAOsVt2d" role="nspSe">
           <property role="TrG5h" value="kind" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42201,7 +42196,6 @@
       <node concept="nspSf" id="JOGAOsVt2g" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt2h" role="nspSe">
           <property role="TrG5h" value="declaration" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42220,15 +42214,12 @@
       <node concept="nspSf" id="JOGAOsVt2k" role="ns1xx">
         <node concept="nstbe" id="JOGAOsVt2l" role="nspSe">
           <property role="TrG5h" value="origin" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="JOGAOsVt2m" role="nspSe">
           <property role="TrG5h" value="ubound" />
-          <property role="nspS5" value="false" />
         </node>
         <node concept="nstbe" id="JOGAOsVt2n" role="nspSe">
           <property role="TrG5h" value="lbound" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42305,7 +42296,6 @@
       <node concept="nspSf" id="JOGAOsVt2F" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt2H" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42315,7 +42305,6 @@
       <node concept="nspSf" id="JOGAOsVt2J" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt2L" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42325,7 +42314,6 @@
       <node concept="nspSf" id="JOGAOsVt2N" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt2P" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42335,7 +42323,6 @@
       <node concept="nspSf" id="JOGAOsVt2R" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt2T" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42345,7 +42332,6 @@
       <node concept="nspSf" id="JOGAOsVt2V" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt2X" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42355,7 +42341,6 @@
       <node concept="nspSf" id="JOGAOsVt2Z" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt31" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42365,7 +42350,6 @@
       <node concept="nspSf" id="JOGAOsVt33" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt35" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
@@ -42375,7 +42359,6 @@
       <node concept="nspSf" id="JOGAOsVt37" role="ns1xx">
         <node concept="nssqF" id="JOGAOsVt39" role="nspSe">
           <property role="TrG5h" value="val" />
-          <property role="nspS5" value="false" />
         </node>
       </node>
     </node>