diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
index d30275f0..dfed2407 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
@@ -58,12 +58,6 @@
         <child id="1173175577737" name="index" index="AHEQo" />
         <child id="1173175590490" name="array" index="AHHXb" />
       </concept>
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
       <concept id="1188220165133" name="jetbrains.mps.baseLanguage.structure.ArrayLiteral" flags="nn" index="2BsdOp">
         <child id="1188220173759" name="item" index="2BsfMF" />
       </concept>
@@ -8711,9 +8705,6 @@
             </node>
           </node>
         </node>
-        <node concept="2AHcQZ" id="2Z5Bs_j_386" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1RiyfbgUJcG" role="jymVt" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
index b5098567..f6a48aa8 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
@@ -904,68 +904,23 @@
       <property role="TrG5h" value="LUB" />
       <node concept="3cqZAl" id="PltxfHwhDD" role="3clF45" />
       <node concept="3clFbS" id="PltxfHwhDH" role="3clF47">
-        <node concept="3SKdUt" id="2Qsys8cXuKg" role="3cqZAp">
-          <node concept="1PaTwC" id="2Qsys8cXuKh" role="1aUNEU">
-            <node concept="3oM_SD" id="2Qsys8cXuKi" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKj" role="1PaTwD">
-              <property role="3oM_SC" value="runtime" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKk" role="1PaTwD">
-              <property role="3oM_SC" value="errors" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKl" role="1PaTwD">
-              <property role="3oM_SC" value="must" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKm" role="1PaTwD">
-              <property role="3oM_SC" value="not" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKn" role="1PaTwD">
-              <property role="3oM_SC" value="be" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKo" role="1PaTwD">
-              <property role="3oM_SC" value="ignored," />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKp" role="1PaTwD">
-              <property role="3oM_SC" value="this" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKq" role="1PaTwD">
-              <property role="3oM_SC" value="is" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKr" role="1PaTwD">
-              <property role="3oM_SC" value="temporary" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKs" role="1PaTwD">
-              <property role="3oM_SC" value="test" />
-            </node>
-            <node concept="3oM_SD" id="2Qsys8cXuKt" role="1PaTwD">
-              <property role="3oM_SC" value="fix" />
-            </node>
-          </node>
-        </node>
         <node concept="2Hmddi" id="PltxfHwhRP" role="3cqZAp">
           <node concept="2OqwBi" id="PltxfHwhRQ" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXuMQ" role="2Oq$k0">
-              <node concept="2YIFZM" id="PltxfHwhRR" role="2Oq$k0">
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="PltxfHwhRS" role="37wK5m">
-                  <node concept="2WthIp" id="PltxfHwhRT" role="2Oq$k0" />
-                  <node concept="2XshWL" id="PltxfHwhRU" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="PltxfHwhRV" role="2XxRq1">
-                      <node concept="ZC_QK" id="PltxfHwhYE" role="2tJFKM">
-                        <ref role="2aWVGs" to="yg5v:2VOKs1ArylV" resolve="Lub" />
-                      </node>
+            <node concept="2YIFZM" id="PltxfHwhRR" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="2OqwBi" id="PltxfHwhRS" role="37wK5m">
+                <node concept="2WthIp" id="PltxfHwhRT" role="2Oq$k0" />
+                <node concept="2XshWL" id="PltxfHwhRU" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="PltxfHwhRV" role="2XxRq1">
+                    <node concept="ZC_QK" id="PltxfHwhYE" role="2tJFKM">
+                      <ref role="2aWVGs" to="yg5v:2VOKs1ArylV" resolve="Lub" />
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="PltxfHwhRX" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="2Qsys8cXuW7" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
+              <node concept="1jxXqW" id="PltxfHwhRX" role="37wK5m" />
             </node>
             <node concept="liA8E" id="PltxfHwhRY" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
index e45e9115..df83f2e7 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
@@ -286,56 +286,23 @@
       <property role="TrG5h" value="NestedGenerics" />
       <node concept="3cqZAl" id="2i6cuYR69K4" role="3clF45" />
       <node concept="3clFbS" id="2i6cuYR69K5" role="3clF47">
-        <node concept="3SKdUt" id="5BtuWK4VeE1" role="3cqZAp">
-          <node concept="1PaTwC" id="5BtuWK4VeE2" role="1aUNEU">
-            <node concept="3oM_SD" id="5BtuWK4VeE3" role="1PaTwD">
-              <property role="3oM_SC" value="fixme:" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeE4" role="1PaTwD">
-              <property role="3oM_SC" value="temporarily" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeE5" role="1PaTwD">
-              <property role="3oM_SC" value="disabled" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeE6" role="1PaTwD">
-              <property role="3oM_SC" value="skipLocal" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeE7" role="1PaTwD">
-              <property role="3oM_SC" value="(in" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeE8" role="1PaTwD">
-              <property role="3oM_SC" value="anticipation" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeE9" role="1PaTwD">
-              <property role="3oM_SC" value="of" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeEa" role="1PaTwD">
-              <property role="3oM_SC" value="MPSCR-63)" />
-            </node>
-          </node>
-        </node>
         <node concept="2Hmddi" id="2i6cuYR69K6" role="3cqZAp">
           <node concept="2OqwBi" id="2i6cuYR69K7" role="2Hmdds">
-            <node concept="2OqwBi" id="5BtuWK4VdWa" role="2Oq$k0">
-              <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="2i6cuYR69K9" role="37wK5m">
-                  <node concept="2WthIp" id="2i6cuYR69Ka" role="2Oq$k0" />
-                  <node concept="2XshWL" id="2i6cuYR69Kb" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="2i6cuYR69Kc" role="2XxRq1">
-                      <node concept="ZC_QK" id="2i6cuYR6ai2" role="2tJFKM">
-                        <ref role="2aWVGs" to="wqtl:2i6cuYR5KJp" resolve="NestedGenerics" />
-                      </node>
+            <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="2OqwBi" id="2i6cuYR69K9" role="37wK5m">
+                <node concept="2WthIp" id="2i6cuYR69Ka" role="2Oq$k0" />
+                <node concept="2XshWL" id="2i6cuYR69Kb" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="2i6cuYR69Kc" role="2XxRq1">
+                    <node concept="ZC_QK" id="2i6cuYR6ai2" role="2tJFKM">
+                      <ref role="2aWVGs" to="wqtl:2i6cuYR5KJp" resolve="NestedGenerics" />
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="2i6cuYR69Ke" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="5BtuWK4Ve8A" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
+              <node concept="1jxXqW" id="2i6cuYR69Ke" role="37wK5m" />
             </node>
             <node concept="liA8E" id="2i6cuYR69Kf" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -598,101 +565,23 @@
       <property role="TrG5h" value="Bounds" />
       <node concept="3cqZAl" id="1TH_SRmLuzj" role="3clF45" />
       <node concept="3clFbS" id="1TH_SRmLuzk" role="3clF47">
-        <node concept="3SKdUt" id="5BtuWK4VeA9" role="3cqZAp">
-          <node concept="1PaTwC" id="5BtuWK4VeAa" role="1aUNEU">
-            <node concept="3oM_SD" id="5BtuWK4VeDn" role="1PaTwD">
-              <property role="3oM_SC" value="fixme:" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeDj" role="1PaTwD">
-              <property role="3oM_SC" value="temporarily" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeDq" role="1PaTwD">
-              <property role="3oM_SC" value="disabled" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeDu" role="1PaTwD">
-              <property role="3oM_SC" value="skipLocal" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeDz" role="1PaTwD">
-              <property role="3oM_SC" value="(in" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeDD" role="1PaTwD">
-              <property role="3oM_SC" value="anticipation" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeDK" role="1PaTwD">
-              <property role="3oM_SC" value="of" />
-            </node>
-            <node concept="3oM_SD" id="5BtuWK4VeDS" role="1PaTwD">
-              <property role="3oM_SC" value="MPSCR-63)" />
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="5o9$c3zUci1" role="3cqZAp">
-          <node concept="1PaTwC" id="5o9$c3zUci2" role="1aUNEU">
-            <node concept="3oM_SD" id="5o9$c3zUci4" role="1PaTwD">
-              <property role="3oM_SC" value="error" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcnb" role="1PaTwD">
-              <property role="3oM_SC" value="types" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcne" role="1PaTwD">
-              <property role="3oM_SC" value="are" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcr5" role="1PaTwD">
-              <property role="3oM_SC" value="ignored" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcyK" role="1PaTwD">
-              <property role="3oM_SC" value="on" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcAD" role="1PaTwD">
-              <property role="3oM_SC" value="purpose:" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcAK" role="1PaTwD">
-              <property role="3oM_SC" value="they" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcEF" role="1PaTwD">
-              <property role="3oM_SC" value="arise" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcMJ" role="1PaTwD">
-              <property role="3oM_SC" value="on" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUcUv" role="1PaTwD">
-              <property role="3oM_SC" value="expected" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUd63" role="1PaTwD">
-              <property role="3oM_SC" value="typechecking" />
-            </node>
-            <node concept="3oM_SD" id="5o9$c3zUddP" role="1PaTwD">
-              <property role="3oM_SC" value="errors" />
-            </node>
-          </node>
-        </node>
         <node concept="2Hmddi" id="1TH_SRmLuzl" role="3cqZAp">
           <node concept="2OqwBi" id="1TH_SRmLuzm" role="2Hmdds">
-            <node concept="2OqwBi" id="5BtuWK4Veja" role="2Oq$k0">
-              <node concept="2OqwBi" id="5o9$c3zUbSC" role="2Oq$k0">
-                <node concept="2YIFZM" id="1TH_SRmLuzn" role="2Oq$k0">
-                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                  <node concept="2OqwBi" id="1TH_SRmLuzo" role="37wK5m">
-                    <node concept="2WthIp" id="1TH_SRmLuzp" role="2Oq$k0" />
-                    <node concept="2XshWL" id="1TH_SRmLuzq" role="2OqNvi">
-                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                      <node concept="2tJFMh" id="1TH_SRmLuzr" role="2XxRq1">
-                        <node concept="ZC_QK" id="1TH_SRmLvZX" role="2tJFKM">
-                          <ref role="2aWVGs" to="wqtl:1TH_SRmEWFy" resolve="Bounds" />
-                        </node>
-                      </node>
+            <node concept="2YIFZM" id="1TH_SRmLuzn" role="2Oq$k0">
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <node concept="2OqwBi" id="1TH_SRmLuzo" role="37wK5m">
+                <node concept="2WthIp" id="1TH_SRmLuzp" role="2Oq$k0" />
+                <node concept="2XshWL" id="1TH_SRmLuzq" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="1TH_SRmLuzr" role="2XxRq1">
+                    <node concept="ZC_QK" id="1TH_SRmLvZX" role="2tJFKM">
+                      <ref role="2aWVGs" to="wqtl:1TH_SRmEWFy" resolve="Bounds" />
                     </node>
                   </node>
-                  <node concept="1jxXqW" id="1TH_SRmLuzt" role="37wK5m" />
-                </node>
-                <node concept="liA8E" id="5o9$c3zUc8X" role="2OqNvi">
-                  <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
                 </node>
               </node>
-              <node concept="liA8E" id="5BtuWK4Vevi" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
-              </node>
+              <node concept="1jxXqW" id="1TH_SRmLuzt" role="37wK5m" />
             </node>
             <node concept="liA8E" id="1TH_SRmLuzu" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />