From 8eb13563bdd2dbaa68492660415aba5913e817b4 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 7 Dec 2023 13:21:16 +0100
Subject: [PATCH] Cleanup + fix some warnings

---
 build/scripts/build_all_scripts.xml           |   2 +-
 .../models/build.mps                          |  61 ++++----
 ...baselang.generator.templates@generator.mps |  24 ---
 .../test.org.mpsqa.arch.baselang.mpl          |  43 ------
 ....ext.ext.generator.templates@generator.mps |  24 ---
 .../test.org.mpsqa.arch.ext.ext.mpl           |  43 ------
 ...arch.ext.generator.templates@generator.mps |  24 ---
 .../test.org.mpsqa.arch.ext.mpl               |  43 ------
 .../org.mpsqa.arch.pluginSolution.plugin.mps  |  75 +++++++---
 .../org.mpsqa.base.utils.notifications.mps    |   4 +-
 .../org.mpsqa.build._000_all_scripts.mps      |  14 --
 .../org.mpsqa.build._010_base_build.mps       |  18 +--
 .../org.mpsqa.build._030_clones_build.mps     | 138 ++++++++++++------
 .../org.mpsqa.build._040_mutant_build.mps     |  48 +-----
 .../org.mpsqa.build._050_unused_build.mps     |  14 --
 .../org.mpsqa.build._060_arch_build.mps       |  14 --
 .../org.mpsqa.build._070_deprecated_build.mps |  14 --
 .../org.mpsqa.build._080_lint_build.mps       |  14 --
 .../org.mpsqa.build._100_allInOne_build.mps   |  14 --
 .../generator/template/main@generator.mps     |  24 ---
 .../org.mpsqa.clones.config.mpl               |  43 ------
 .../models/org.mpsqa.clones.build.mps         |  17 ---
 ...qa.clones.config.pluginSolution.plugin.mps |   7 -
 .../models/_000_infrastructure@tests.mps      |  20 +++
 ...estcode._010_identical_java_statements.mps |  23 +++
 ...mple_lan.generator.templates@generator.mps |  24 ---
 .../org.mpsqa.deprecated.example_lan.mpl      |  43 ------
 .../generator/templates/main@generator.mps    |  24 ---
 .../org.mpsqa.mutant.demolang.mpl             |  43 ------
 .../generator/templates/main@generator.mps    |  24 ---
 .../org.mpsqa.mutant/org.mpsqa.mutant.mpl     |  43 ------
 31 files changed, 229 insertions(+), 737 deletions(-)
 delete mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
 delete mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
 delete mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
 delete mode 100644 code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
 delete mode 100644 code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
 delete mode 100644 code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
 delete mode 100644 code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps

diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 8d4ceeec..3c054f7a 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -3,7 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/org.mpsqa.allScripts" />
   <property name="build.layout" location="${build.dir}/artifacts/org.mpsqa.allScripts" />
-  <property name="mps.home" location="${basedir}/../../../MPS_2020_3_5" />
+  <property name="mps.home" location="" />
   <property name="mpsqa.home" location="${basedir}/../.." />
   <property name="mpsqa.build.home" location="${mpsqa.home}/code/languages/org.mpsqa.build" />
   <property name="artifacts.mps" location="${mps.home}" />
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
index aac68473..fa00f2d1 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
@@ -9,6 +9,7 @@
   <imports>
     <import index="c9zv" ref="r:c9eae771-f543-4d3e-89a7-0f86ee2dae52(org.mpsqa.clones.build)" />
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
+    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.build._010_base_build)" />
     <import index="5g2w" ref="r:eecfcc09-6fb4-4fd4-bb99-b3d1712ec5a4(org.mpsqa.build._030_clones_build)" implicit="true" />
   </imports>
   <registry>
@@ -110,6 +111,12 @@
       <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
         <child id="763829979718664967" name="files" index="3rtmxm" />
       </concept>
+      <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
+        <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
+        <property id="8137134783396676838" name="extracted" index="1HemKv" />
+        <property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
+        <child id="8137134783396676835" name="location" index="1HemKq" />
+      </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA">
         <property id="269707337715731330" name="sourcesKind" index="aoJFB" />
       </concept>
@@ -222,6 +229,31 @@
             <ref role="3bR37D" to="5g2w:2JVMSZMFXgS" resolve="org.mpsqa.clones.config.pluginSolution" />
           </node>
         </node>
+        <node concept="1BupzO" id="7j9WyvhwngV" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9WyvhwngW" role="1HemKq">
+            <node concept="398BVA" id="7j9WyvhwngL" role="3LXTmr">
+              <ref role="398BVh" node="1GhTetdB0oc" resolve="mpsqa.clones.detection.home" />
+              <node concept="2Ry0Ak" id="7j9WyvhwngM" role="iGT6I">
+                <property role="2Ry0Am" value="code" />
+                <node concept="2Ry0Ak" id="7j9WyvhwngN" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7j9WyvhwngO" role="2Ry0An">
+                    <property role="2Ry0Am" value="org.mpsqa.clones.demo.config" />
+                    <node concept="2Ry0Ak" id="7j9WyvhwngP" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9WyvhwngX" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="2JVMSZMFY8e" role="1l3spa">
@@ -236,34 +268,11 @@
         <ref role="398BVh" node="1GhTetdB0o4" resolve="mps_home" />
       </node>
     </node>
+    <node concept="2sgV4H" id="7j9WyvhwmK6" role="1l3spa">
+      <ref role="1l3spb" to="2tou:7C9PHv6FBIG" resolve="org.mpsqa.base" />
+    </node>
     <node concept="398rNT" id="1GhTetdB0o4" role="1l3spd">
       <property role="TrG5h" value="mps_home" />
-      <node concept="55IIr" id="1GhTetdB0o5" role="398pKh">
-        <node concept="2Ry0Ak" id="1GhTetdB0o6" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="1GhTetdB0o7" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="1GhTetdB0o8" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="1GhTetdB0o9" role="2Ry0An">
-                <property role="2Ry0Am" value=".." />
-                <node concept="2Ry0Ak" id="1GhTetdBQO4" role="2Ry0An">
-                  <property role="2Ry0Am" value=".." />
-                  <node concept="2Ry0Ak" id="6dJ4vxiTQkY" role="2Ry0An">
-                    <property role="2Ry0Am" value=".." />
-                    <node concept="2Ry0Ak" id="6dJ4vxiTQxP" role="2Ry0An">
-                      <property role="2Ry0Am" value=".." />
-                      <node concept="2Ry0Ak" id="6dJ4vxiUhxf" role="2Ry0An">
-                        <property role="2Ry0Am" value="MPS_2018_3_7_esd_devel_clones_detection" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="1GhTetdB0oc" role="1l3spd">
       <property role="TrG5h" value="mpsqa.clones.detection.home" />
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
deleted file mode 100644
index bad81fc9..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:6c01fb35-6d14-4bfc-a6dd-c0d4f33f54b6(test.org.mpsqa.arch.baselang.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="tz9v" ref="r:ab6dc11a-5319-44b2-894f-9eccae1e75b7(test.org.mpsqa.arch.baselang.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="6ESRMYIDhR9">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
index 719694eb..5a958a53 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="test.org.mpsqa.arch.baselang.generator" uuid="45226294-adfe-4ecb-ae82-fc19c7a5feaa">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="bcaa03af-4226-4b43-a0ed-7ecc5d6748d9(test.org.mpsqa.arch.baselang)" version="0" />
-        <module reference="45226294-adfe-4ecb-ae82-fc19c7a5feaa(test.org.mpsqa.arch.baselang.generator)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
deleted file mode 100644
index 1f4ca1a8..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:d3b20cac-ad7e-4c07-9314-52cc348fb9b6(test.org.mpsqa.arch.ext.ext.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="ebeo" ref="r:99cf0c8e-1774-4bf5-8f71-f8183fc8c323(test.org.mpsqa.arch.ext.ext.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="fm3v0X0Tn_">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
index e2878d79..f4e257c7 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="test.org.mpsqa.arch.ext.ext.generator" uuid="ccf37458-7029-4d65-bf9e-a5d781557943">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="0777ffbf-ace4-4237-ba8d-43a217645761(test.org.mpsqa.arch.ext.ext)" version="0" />
-        <module reference="ccf37458-7029-4d65-bf9e-a5d781557943(test.org.mpsqa.arch.ext.ext.generator)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
deleted file mode 100644
index eae69d7d..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:6a276193-7faf-4eff-b825-2e187db1f7b5(test.org.mpsqa.arch.ext.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="q35j" ref="r:91e8ed87-94d4-4d7a-b673-f6284141d0a2(test.org.mpsqa.arch.ext.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="6ESRMYIDijB">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
index 5498e063..5c8a5a26 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="test.org.mpsqa.arch.ext.generator" uuid="3b8e07e8-51e0-4b88-b953-5a05fcf685c6">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="9e2430af-289d-4254-9192-096b6a0cdea0(test.org.mpsqa.arch.ext)" version="0" />
-        <module reference="3b8e07e8-51e0-4b88-b953-5a05fcf685c6(test.org.mpsqa.arch.ext.generator)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <dependencies>
     <dependency reexport="false">bcaa03af-4226-4b43-a0ed-7ecc5d6748d9(test.org.mpsqa.arch.baselang)</dependency>
   </dependencies>
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
index 5e1277b1..79ca31cd 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
@@ -29,6 +29,7 @@
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="r791" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.text(JDK/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -469,18 +470,33 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1Nl9e7Dzzni" role="3cqZAp">
-          <node concept="2YIFZM" id="1Nl9e7DzzrI" role="3clFbG">
-            <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
-            <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
-            <node concept="2OqwBi" id="1Nl9e7DzzIK" role="37wK5m">
-              <node concept="2WthIp" id="1Nl9e7DzzsT" role="2Oq$k0" />
-              <node concept="1DTwFV" id="1Nl9e7DzzYh" role="2OqNvi">
-                <ref role="2WH_rO" node="1tkdAPw5qGO" resolve="proj" />
-              </node>
+        <node concept="3clFbF" id="7j9WyvhatFp" role="3cqZAp">
+          <node concept="2OqwBi" id="7j9WyvhaupY" role="3clFbG">
+            <node concept="2YIFZM" id="7j9WyvhatLd" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
             </node>
-            <node concept="37vLTw" id="1Nl9e7Dz$1W" role="37wK5m">
-              <ref role="3cqZAo" node="1tkdAPw5gL_" resolve="source" />
+            <node concept="liA8E" id="7j9WyvhawCA" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="7j9WyvhawDT" role="37wK5m">
+                <node concept="3clFbS" id="7j9WyvhawDW" role="1bW5cS">
+                  <node concept="3clFbF" id="1Nl9e7Dzzni" role="3cqZAp">
+                    <node concept="2YIFZM" id="1Nl9e7DzzrI" role="3clFbG">
+                      <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
+                      <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
+                      <node concept="2OqwBi" id="1Nl9e7DzzIK" role="37wK5m">
+                        <node concept="2WthIp" id="1Nl9e7DzzsT" role="2Oq$k0" />
+                        <node concept="1DTwFV" id="1Nl9e7DzzYh" role="2OqNvi">
+                          <ref role="2WH_rO" node="1tkdAPw5qGO" resolve="proj" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="1Nl9e7Dz$1W" role="37wK5m">
+                        <ref role="3cqZAo" node="1tkdAPw5gL_" resolve="source" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -3125,18 +3141,33 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1Nl9e7Dz$jV" role="3cqZAp">
-          <node concept="2YIFZM" id="1Nl9e7Dz$jW" role="3clFbG">
-            <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
-            <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
-            <node concept="2OqwBi" id="1Nl9e7Dz$jX" role="37wK5m">
-              <node concept="2WthIp" id="1Nl9e7Dz$jY" role="2Oq$k0" />
-              <node concept="1DTwFV" id="1Nl9e7Dz$jZ" role="2OqNvi">
-                <ref role="2WH_rO" node="1Nl9e7Dz$k5" resolve="proj" />
-              </node>
+        <node concept="3clFbF" id="7j9WyvhaxaL" role="3cqZAp">
+          <node concept="2OqwBi" id="7j9WyvhaxTp" role="3clFbG">
+            <node concept="2YIFZM" id="7j9WyvhaxgC" role="2Oq$k0">
+              <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
             </node>
-            <node concept="37vLTw" id="1Nl9e7Dz$k0" role="37wK5m">
-              <ref role="3cqZAo" node="1Nl9e7Dz$jJ" resolve="source" />
+            <node concept="liA8E" id="7j9WyvhayuG" role="2OqNvi">
+              <ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
+              <node concept="1bVj0M" id="7j9WyvhayvZ" role="37wK5m">
+                <node concept="3clFbS" id="7j9Wyvhayw2" role="1bW5cS">
+                  <node concept="3clFbF" id="1Nl9e7Dz$jV" role="3cqZAp">
+                    <node concept="2YIFZM" id="1Nl9e7Dz$jW" role="3clFbG">
+                      <ref role="37wK5l" node="1Nl9e7Dzqh4" resolve="displayPlantUml" />
+                      <ref role="1Pybhc" node="1Nl9e7Dzq0d" resolve="PlantUMLToolStarter" />
+                      <node concept="2OqwBi" id="1Nl9e7Dz$jX" role="37wK5m">
+                        <node concept="2WthIp" id="1Nl9e7Dz$jY" role="2Oq$k0" />
+                        <node concept="1DTwFV" id="1Nl9e7Dz$jZ" role="2OqNvi">
+                          <ref role="2WH_rO" node="1Nl9e7Dz$k5" resolve="proj" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="1Nl9e7Dz$k0" role="37wK5m">
+                        <ref role="3cqZAo" node="1Nl9e7Dz$jJ" resolve="source" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
index 85bc2fd4..5fe0e5c4 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
@@ -32,7 +32,6 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
@@ -145,7 +144,7 @@
             </node>
             <node concept="2ShNRf" id="xCk$O6mj3r" role="33vP2m">
               <node concept="1pGfFk" id="xCk$O6mj3O" role="2ShVmc">
-                <ref role="37wK5l" to="fnpx:~Notification.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,com.intellij.notification.NotificationType,com.intellij.notification.NotificationListener)" resolve="Notification" />
+                <ref role="37wK5l" to="fnpx:~Notification.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,com.intellij.notification.NotificationType)" resolve="Notification" />
                 <node concept="2OqwBi" id="xCk$O6mjh0" role="37wK5m">
                   <node concept="37vLTw" id="zudvsqcbpf" role="2Oq$k0">
                     <ref role="3cqZAo" node="71GfFl7hN$8" resolve="mpsqaBalloonGroup" />
@@ -163,7 +162,6 @@
                 <node concept="37vLTw" id="xCk$O6mjA0" role="37wK5m">
                   <ref role="3cqZAo" node="xCk$O6mjqq" resolve="type" />
                 </node>
-                <node concept="10Nm6u" id="xCk$O6mj3X" role="37wK5m" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps
index 1287436a..e7b49378 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._000_all_scripts.mps
@@ -118,20 +118,6 @@
     <property role="turDy" value="build_all_scripts.xml" />
     <node concept="398rNT" id="7C9PHv6FBIK" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="7C9PHv6FBIS" role="398pKh">
-        <node concept="2Ry0Ak" id="7C9PHv6FBJ3" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="7C9PHv6FBJh" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="7C9PHv6FBJx" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="67NgLmjP_3j" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2020_3_5" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="7C9PHv6FBIJ" role="1l3spd">
       <property role="TrG5h" value="mpsqa.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
index 2b8eebbf..b181740b 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
@@ -91,11 +91,11 @@
       </concept>
       <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
       <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
-        <property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
         <child id="5253498789149547825" name="sources" index="3bR31x" />
         <child id="5253498789149547704" name="dependencies" index="3bR37C" />
       </concept>
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
+        <property id="5253498789149547713" name="reexport" index="3bR36h" />
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
@@ -126,20 +126,6 @@
     <node concept="3b7kt6" id="7C9PHv6FBII" role="10PD9s" />
     <node concept="398rNT" id="7C9PHv6FBIK" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="7C9PHv6FBIS" role="398pKh">
-        <node concept="2Ry0Ak" id="7C9PHv6FBJ3" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="7C9PHv6FBJh" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="7C9PHv6FBJx" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="7C9PHv6FBJP" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="7C9PHv6FBIJ" role="1l3spd">
       <property role="TrG5h" value="mpsqa.home" />
@@ -351,7 +337,6 @@
         <property role="TrG5h" value="org.mpsqa.base.lib" />
         <property role="3LESm3" value="79c13063-8a7d-4070-aaba-966b36d6e0c4" />
         <property role="BnDLt" value="true" />
-        <property role="2GAjPV" value="true" />
         <node concept="398BVA" id="7C9PHv6FBJa" role="3LF7KH">
           <ref role="398BVh" node="7C9PHv6FBIL" resolve="mpsqa.base.home" />
           <node concept="2Ry0Ak" id="7C9PHv6FBJr" role="iGT6I">
@@ -470,6 +455,7 @@
         </node>
         <node concept="1SiIV0" id="7C9PHv6FBMH" role="3bR37C">
           <node concept="3bR9La" id="7C9PHv6FBMI" role="1SiIV1">
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
index 13dde5a1..fee5df04 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
@@ -98,11 +98,14 @@
       <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
         <child id="763829979718664967" name="files" index="3rtmxm" />
       </concept>
-      <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
-      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
-      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
-        <child id="9200313594498201639" name="generator" index="1TViLv" />
+      <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
+        <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
+        <property id="8137134783396676838" name="extracted" index="1HemKv" />
+        <property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
+        <child id="8137134783396676835" name="location" index="1HemKq" />
       </concept>
+      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD" />
       <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
         <property id="8369506495128725901" name="compact" index="BnDLt" />
         <property id="322010710375892619" name="uuid" index="3LESm3" />
@@ -132,20 +135,6 @@
     </node>
     <node concept="398rNT" id="2JVMSZMFXgl" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="2JVMSZMFXMl" role="398pKh">
-        <node concept="2Ry0Ak" id="2JVMSZMFXNT" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="2JVMSZMFXR3" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="2JVMSZMFXTN" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3PN66LDqbXa" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="2JVMSZMFXgq" role="1l3spd">
       <property role="TrG5h" value="mpsqa.clones.home" />
@@ -265,34 +254,31 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2JVMSZMFXhS" role="3bR37C">
-          <node concept="3bR9La" id="2JVMSZMFXhT" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2JVMSZMFXEZ" role="3bR37C">
-          <node concept="3bR9La" id="2JVMSZMFXF0" role="1SiIV1">
-            <ref role="3bR37D" node="2JVMSZMFXgM" resolve="org.mpsqa.clones.pluginSolution" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2JVMSZMFXF1" role="3bR37C">
           <node concept="3bR9La" id="2JVMSZMFXF2" role="1SiIV1">
             <ref role="3bR37D" to="2tou:7C9PHv6FBJ1" resolve="org.mpsqa.base.lib" />
           </node>
         </node>
-        <node concept="1SiIV0" id="vol1C1m$hK" role="3bR37C">
-          <node concept="3bR9La" id="vol1C1m$hL" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="vol1C1m$hM" role="3bR37C">
-          <node concept="3bR9La" id="vol1C1m$hN" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L8Y" resolve="jetbrains.mps.lang.project" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="vol1C1m$hO" role="3bR37C">
-          <node concept="3bR9La" id="vol1C1m$hP" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
+        <node concept="1BupzO" id="7j9Wyvhv8Nj" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8Nk" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8N8" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8N9" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8Na" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.core" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8Nb" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8Nl" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
           </node>
         </node>
       </node>
@@ -373,6 +359,28 @@
             </node>
           </node>
         </node>
+        <node concept="1BupzO" id="7j9Wyvhv8Nx" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8Ny" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8Nm" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8Nn" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8No" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.pluginSolution" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8Np" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8Nz" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2JVMSZMFXgS" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -441,6 +449,28 @@
             </node>
           </node>
         </node>
+        <node concept="1BupzO" id="7j9Wyvhv8NJ" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8NK" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8N$" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8N_" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8NA" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.config.pluginSolution" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8NB" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8NL" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="2JVMSZMFXgY" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -463,10 +493,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1yeLz9" id="2JVMSZMFXiy" role="1TViLv">
-          <property role="TrG5h" value="org.mpsqa.clones.config#01" />
-          <property role="3LESm3" value="652ee78b-a037-4640-8f3d-b20c9bc39b99" />
-        </node>
         <node concept="3rtmxn" id="2JVMSZMFXCE" role="3bR31x">
           <node concept="3LXTmp" id="2JVMSZMFXCF" role="3rtmxm">
             <node concept="398BVA" id="2JVMSZMFXCG" role="3LXTmr">
@@ -493,6 +519,28 @@
             <ref role="3bR37D" node="2JVMSZMFXgA" resolve="org.mpsqa.clones.core" />
           </node>
         </node>
+        <node concept="1BupzO" id="7j9Wyvhv8NX" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7j9Wyvhv8NY" role="1HemKq">
+            <node concept="398BVA" id="7j9Wyvhv8NM" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="7j9Wyvhv8NN" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7j9Wyvhv8NO" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.config" />
+                  <node concept="2Ry0Ak" id="7j9Wyvhv8NP" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7j9Wyvhv8NZ" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="1GhTetdB0pU" role="auvoZ" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
index 7dd1139b..a4ce8e28 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
@@ -99,7 +99,6 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
-      <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
@@ -107,9 +106,7 @@
         <child id="8137134783396676835" name="location" index="1HemKq" />
       </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
-      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
-        <child id="9200313594498201639" name="generator" index="1TViLv" />
-      </concept>
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD" />
       <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
         <property id="8369506495128725901" name="compact" index="BnDLt" />
         <property id="322010710375892619" name="uuid" index="3LESm3" />
@@ -142,20 +139,6 @@
     </node>
     <node concept="398rNT" id="3PN66LDqBYS" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3PN66LDqBZ0" role="398pKh">
-        <node concept="2Ry0Ak" id="3PN66LDqBZf" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3PN66LDqBZV" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3PN66LDqC0y" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3PN66LDqC0E" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="3PN66LDqBYT" role="1l3spd">
       <property role="TrG5h" value="mpsqa.mutant.home" />
@@ -372,35 +355,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1yeLz9" id="3PN66LDqBZQ" role="1TViLv">
-          <property role="TrG5h" value="org.mpsqa.mutant#01" />
-          <property role="3LESm3" value="a1ea3065-b806-410b-ace7-90f70832ba61" />
-          <node concept="1BupzO" id="3PN66LDrCxb" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="3PN66LDrCxc" role="1HemKq">
-              <node concept="398BVA" id="3PN66LDrCwY" role="3LXTmr">
-                <ref role="398BVh" node="3PN66LDqBYT" resolve="mpsqa.mutant.home" />
-                <node concept="2Ry0Ak" id="3PN66LDrCwZ" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="3PN66LDrCx0" role="2Ry0An">
-                    <property role="2Ry0Am" value="org.mpsqa.mutant" />
-                    <node concept="2Ry0Ak" id="3PN66LDrCx1" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="3PN66LDrCx2" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="3PN66LDrCxd" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="3PN66LDqBZT" role="3bR37C">
           <node concept="3bR9La" id="3PN66LDqC0x" role="1SiIV1">
             <ref role="3bR37D" node="3PN66LDqBZa" resolve="org.mpsqa.mutant.base" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
index 2788e375..d731072a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
@@ -145,20 +145,6 @@
     </node>
     <node concept="398rNT" id="1YSnQiVh0x6" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="1YSnQiVh0xf" role="398pKh">
-        <node concept="2Ry0Ak" id="1YSnQiVh0xt" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="1YSnQiVh0xW" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="1YSnQiVh0yn" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="1YSnQiVh0yz" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="1YSnQiVh0x7" role="1l3spd">
       <property role="TrG5h" value="mpsqa.unused.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
index d525e28b..c12ea88a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
@@ -149,20 +149,6 @@
     </node>
     <node concept="398rNT" id="50Wzfz4shz4" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="50Wzfz4shzd" role="398pKh">
-        <node concept="2Ry0Ak" id="50Wzfz4shzp" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="50Wzfz4shzI" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="50Wzfz4shzY" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="50Wzfz4sh$6" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="50Wzfz4shz5" role="1l3spd">
       <property role="TrG5h" value="mpsqa.arch.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
index 13a10729..19ef015a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
@@ -142,20 +142,6 @@
     </node>
     <node concept="398rNT" id="3dqUbgQmcyu" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3dqUbgQmcyB" role="398pKh">
-        <node concept="2Ry0Ak" id="3dqUbgQmcyO" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3dqUbgQmcze" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3dqUbgQmcz$" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3dqUbgQmczM" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="3dqUbgQmcyv" role="1l3spd">
       <property role="TrG5h" value="mpsqa.deprecated.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
index 78917ff6..e0733a94 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
@@ -148,20 +148,6 @@
     </node>
     <node concept="398rNT" id="3dqUbgQmcyu" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3dqUbgQmcyB" role="398pKh">
-        <node concept="2Ry0Ak" id="3dqUbgQmcyO" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3dqUbgQmcze" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3dqUbgQmcz$" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3dqUbgQmczM" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="3dqUbgQmcyv" role="1l3spd">
       <property role="TrG5h" value="mpsqa.lint.home" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
index 3c64901a..3cc103ad 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
@@ -110,20 +110,6 @@
     </node>
     <node concept="398rNT" id="3PN66LDqBUA" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="3PN66LDqBUI" role="398pKh">
-        <node concept="2Ry0Ak" id="3PN66LDqBUX" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="3PN66LDqBVD" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="3PN66LDqBWg" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="3PN66LDqBWo" role="2Ry0An">
-                <property role="2Ry0Am" value="MPS_2019_3_4" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="2sgV4H" id="3PN66LDqBUC" role="1l3spa">
       <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
deleted file mode 100644
index 06953a8d..00000000
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b4bbaa4c-10f8-4967-96a5-ce8d80aca69f(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="mpzi" ref="r:07e7fd96-d60b-4292-b200-0ad59ee3fadf(org.mpsqa.clones.config.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="7vLq_hstKZO">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
index a187d786..dd533043 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.clones.config#01" uuid="652ee78b-a037-4640-8f3d-b20c9bc39b99">
-      <models>
-        <modelRoot contentPath="${module}/generator/template" type="default">
-          <sourceRoot location="." />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="56cfcf05-92e4-4822-8126-2ea0e0cece6b(org.mpsqa.clones.config)" version="0" />
-        <module reference="652ee78b-a037-4640-8f3d-b20c9bc39b99(org.mpsqa.clones.config#01)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <dependencies>
     <dependency reexport="false">56cfcf05-92e4-4822-8126-2ea0e0cece6b(org.mpsqa.clones.config)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
index 00a81f22..196084f8 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
@@ -192,23 +192,6 @@
     </node>
     <node concept="398rNT" id="1GhTetdB0o4" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
-      <node concept="55IIr" id="1GhTetdB0o5" role="398pKh">
-        <node concept="2Ry0Ak" id="1GhTetdB0o6" role="iGT6I">
-          <property role="2Ry0Am" value=".." />
-          <node concept="2Ry0Ak" id="1GhTetdB0o7" role="2Ry0An">
-            <property role="2Ry0Am" value=".." />
-            <node concept="2Ry0Ak" id="1GhTetdB0o8" role="2Ry0An">
-              <property role="2Ry0Am" value=".." />
-              <node concept="2Ry0Ak" id="1GhTetdB0o9" role="2Ry0An">
-                <property role="2Ry0Am" value=".." />
-                <node concept="2Ry0Ak" id="52XWqlKvtCw" role="2Ry0An">
-                  <property role="2Ry0Am" value="MPS_2019_3" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="398rNT" id="1GhTetdB0oc" role="1l3spd">
       <property role="TrG5h" value="mpsqa.clones.home" />
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
index 42bfebb1..ae90a2c1 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
@@ -167,7 +167,6 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -183,12 +182,6 @@
     <property role="TrG5h" value="CheckClonesForConfig" />
     <property role="2uzpH1" value="Detect Clones for Configuration" />
     <property role="1rBW0U" value="true" />
-    <node concept="2S4$dB" id="7WP_sw5xafg" role="1NuT2Z">
-      <property role="TrG5h" value="model" />
-      <node concept="3Tm6S6" id="7WP_sw5xafh" role="1B3o_S" />
-      <node concept="1oajcY" id="7WP_sw5xafi" role="1oa70y" />
-      <node concept="H_c77" id="7WP_sw5x5x4" role="1tU5fm" />
-    </node>
     <node concept="1DS2jV" id="7WP_sw5xcoC" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
index c25502d3..ba18dea4 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
@@ -148,6 +148,10 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
+        <property id="8575328350543493365" name="message" index="huDt6" />
+        <property id="2423417345669755629" name="filter" index="1eyWvh" />
+      </concept>
     </language>
   </registry>
   <node concept="2XOHcx" id="5dW8pSKf75s">
@@ -328,6 +332,10 @@
         <node concept="2tJIrI" id="4elAKXiq8DM" role="jymVt" />
         <node concept="312cEg" id="4elAKXiq8Eo" role="jymVt">
           <property role="TrG5h" value="a1" />
+          <node concept="15s5l7" id="7j9Wyvhu0wU" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Field is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7581428506283755675]&quot;;" />
+            <property role="huDt6" value="Warning: Field is never used" />
+          </node>
           <node concept="17QB3L" id="4elAKXiq8Ea" role="1tU5fm" />
           <node concept="Xl_RD" id="4elAKXiq8EO" role="33vP2m">
             <property role="Xl_RC" value="something" />
@@ -338,6 +346,10 @@
         </node>
         <node concept="312cEg" id="4elAKXiq8FC" role="jymVt">
           <property role="TrG5h" value="a2" />
+          <node concept="15s5l7" id="7j9Wyvhu0z0" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Field is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7581428506283755675]&quot;;" />
+            <property role="huDt6" value="Warning: Field is never used" />
+          </node>
           <node concept="17QB3L" id="4elAKXiq8FD" role="1tU5fm" />
           <node concept="Xl_RD" id="4elAKXiq8FE" role="33vP2m">
             <property role="Xl_RC" value="something1" />
@@ -348,6 +360,10 @@
         </node>
         <node concept="312cEg" id="4elAKXiqb1T" role="jymVt">
           <property role="TrG5h" value="a3" />
+          <node concept="15s5l7" id="7j9Wyvhu0_6" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Field is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7581428506283755675]&quot;;" />
+            <property role="huDt6" value="Warning: Field is never used" />
+          </node>
           <node concept="17QB3L" id="4elAKXiqb1U" role="1tU5fm" />
           <node concept="3cpWs3" id="4elAKXiqbh0" role="33vP2m">
             <node concept="3cmrfG" id="4elAKXiqbhf" role="3uHU7w">
@@ -364,6 +380,10 @@
         <node concept="2tJIrI" id="4elAKXiq8Fq" role="jymVt" />
         <node concept="3clFb_" id="4elAKXiqfkC" role="jymVt">
           <property role="TrG5h" value="meth" />
+          <node concept="15s5l7" id="7j9Wyvhu0Bm" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Package protected method meth():void is never used&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/7938578788781949884]&quot;;" />
+            <property role="huDt6" value="Warning: Package protected method meth():void is never used" />
+          </node>
           <node concept="3clFbS" id="4elAKXiqfkF" role="3clF47">
             <node concept="9aQIb" id="4elAKXiqflp" role="3cqZAp">
               <node concept="3clFbS" id="4elAKXiqflq" role="9aQI4">
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
index 0b9ad376..101209e8 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
@@ -74,9 +74,16 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
+        <property id="8575328350543493365" name="message" index="huDt6" />
+        <property id="2423417345669755629" name="filter" index="1eyWvh" />
+      </concept>
     </language>
   </registry>
   <node concept="312cEu" id="5dW8pSK6xri">
@@ -86,6 +93,14 @@
       <property role="TrG5h" value="meth1" />
       <node concept="3clFbS" id="5dW8pSK6xti" role="3clF47">
         <node concept="3cpWs8" id="5dW8pSK6y2p" role="3cqZAp">
+          <node concept="15s5l7" id="7j9Wyvhu3jT" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Variable 'a' initializer is redundant&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/963887337804010668]&quot;;" />
+            <property role="huDt6" value="Warning: Variable 'a' initializer is redundant" />
+          </node>
+          <node concept="15s5l7" id="7j9Wyvhu1e_" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Unused variable&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/4056233746948448436]&quot;;" />
+            <property role="huDt6" value="Warning: Unused variable" />
+          </node>
           <node concept="3cpWsn" id="5dW8pSK6y2s" role="3cpWs9">
             <property role="TrG5h" value="a" />
             <node concept="10Oyi0" id="5dW8pSK6y2n" role="1tU5fm" />
@@ -145,6 +160,14 @@
       <property role="TrG5h" value="meth2" />
       <node concept="3clFbS" id="5dW8pSK6_4h" role="3clF47">
         <node concept="3cpWs8" id="5dW8pSK6_4i" role="3cqZAp">
+          <node concept="15s5l7" id="7j9Wyvhu2mM" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Unused variable&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/4056233746948448436]&quot;;" />
+            <property role="huDt6" value="Warning: Unused variable" />
+          </node>
+          <node concept="15s5l7" id="7j9Wyvhu1pG" role="lGtFl">
+            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;FLAVOUR_MESSAGE=&quot;Warning: Variable 'a' initializer is redundant&quot;;FLAVOUR_RULE_ID=&quot;[r:00000000-0000-4000-0000-011c895902c5(jetbrains.mps.baseLanguage.typesystem)/963887337804010668]&quot;;" />
+            <property role="huDt6" value="Warning: Variable 'a' initializer is redundant" />
+          </node>
           <node concept="3cpWsn" id="5dW8pSK6_4j" role="3cpWs9">
             <property role="TrG5h" value="a" />
             <node concept="10Oyi0" id="5dW8pSK6_4k" role="1tU5fm" />
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
deleted file mode 100644
index a95a65e3..00000000
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:792fc33e-d546-44f0-8b16-783996978f8f(org.mpsqa.deprecated.example_lan.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="a69o" ref="r:96c04daa-82d3-42de-a138-984ac0a40302(org.mpsqa.deprecated.example_lan.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="4z4cFcoLYUA">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
index c0e4ebec..512c7dd9 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.deprecated.example_lan.generator" uuid="45589ccc-6ba9-4836-9136-04256950ca3f">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="4964867e-90b8-4a58-b13e-6cd7893d620f(org.mpsqa.deprecated.example_lan)" version="0" />
-        <module reference="45589ccc-6ba9-4836-9136-04256950ca3f(org.mpsqa.deprecated.example_lan.generator)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
deleted file mode 100644
index 82a2d0c8..00000000
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:592d8aef-b1bd-4d2e-947a-4eb586c486ee(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="dfoi" ref="r:e7aa0652-5f88-4c12-b15d-0c397e3ad1db(org.mpsqa.mutant.demolang.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="4eFGY40mZcM">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
index 0a785816..22767f04 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.mutant.demolang#01" uuid="26d62420-05d2-444f-a995-9ef760c32323">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="3313ed27-e24e-4f1d-81b0-b1b57775ffac(org.mpsqa.mutant.demolang)" version="0" />
-        <module reference="26d62420-05d2-444f-a995-9ef760c32323(org.mpsqa.mutant.demolang#01)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps
deleted file mode 100644
index 2c47c0c5..00000000
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a0096923-0f65-4bae-9f56-bbd0dd7b4560(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="2yhq" ref="r:fa8966f2-655e-439b-931a-1696875e83e1(org.mpsqa.mutant.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="4eFGY40ppJM">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
index 2516dc49..ab1725d2 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="org.mpsqa.mutant#01" uuid="a1ea3065-b806-410b-ace7-90f70832ba61">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="1aa30e2f-c768-4ae5-9ea2-0d88d0d6d7bf(org.mpsqa.mutant)" version="0" />
-        <module reference="a1ea3065-b806-410b-ace7-90f70832ba61(org.mpsqa.mutant#01)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <dependencies>
     <dependency reexport="false">434ae70d-b732-4ce4-82f0-942388529867(org.mpsqa.mutant.base)</dependency>
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>