diff --git a/.mps/modules.xml b/.mps/modules.xml
index 60af63fa..87416d6d 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -13,13 +13,11 @@
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.typecheck/jetbrains.mps.typecheck.mpl" folder="typecheck" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.typecheck/runtime/jetbrains.mps.typecheck.runtime.msd" folder="typecheck" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.typecheck/sandbox/jetbrains.mps.typecheck.sandbox.msd" folder="typecheck" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.type.sandbox.runner/jetbrains.mps.type.sandbox.runner.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.type.sandbox/jetbrains.mps.type.sandbox.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.type.solver/jetbrains.mps.type.solver.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typesystem2" />
+      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typecheck" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.unification.tree/jetbrains.mps.unification.tree.msd" folder="" />
     </projectModules>
   </component>
diff --git a/languages/jetbrains.mps.typecheck/generator/template/main@generator.mps b/languages/jetbrains.mps.typecheck/generator/template/main@generator.mps
deleted file mode 100644
index 260464dd..00000000
--- a/languages/jetbrains.mps.typecheck/generator/template/main@generator.mps
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:faf7bcb6-2464-4420-9999-0349962a3d3b(jetbrains.mps.typecheck.generator.template.main@generator)">
-  <persistence version="8" />
-  <language namespace="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" />
-  <language namespace="d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext)" />
-  <language namespace="a2ea22de-b72c-4ba2-8eb5-b87d86146d6b(jetbrains.mps.typecheck)" />
-  <language namespace="b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)" />
-  <devkit namespace="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  <import index="tpck" modelUID="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" version="0" implicit="yes" />
-  <import index="tpf8" modelUID="r:00000000-0000-4000-0000-011c895902e8(jetbrains.mps.lang.generator.structure)" version="2" implicit="yes" />
-  <root type="tpf8.MappingConfiguration" typeId="tpf8.1095416546421" id="3113146058911352905" nodeInfo="ng">
-    <property name="name" nameId="tpck.1169194664001" value="main" />
-  </root>
-</model>
-
diff --git a/languages/jetbrains.mps.typecheck/jetbrains.mps.typecheck.mpl b/languages/jetbrains.mps.typecheck/jetbrains.mps.typecheck.mpl
deleted file mode 100644
index e01008e9..00000000
--- a/languages/jetbrains.mps.typecheck/jetbrains.mps.typecheck.mpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.typecheck" uuid="a2ea22de-b72c-4ba2-8eb5-b87d86146d6b">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="languageModels" />
-    </modelRoot>
-  </models>
-  <accessoryModels />
-  <generators>
-    <generator generatorUID="jetbrains.mps.typecheck#3113146058911352904" uuid="3e510635-c495-4bb0-a1f9-28b9d9a22a44">
-      <models>
-        <modelRoot contentPath="${module}" type="default">
-          <sourceRoot location="generator/template" />
-        </modelRoot>
-      </models>
-      <external-templates />
-      <usedLanguages>
-        <usedLanguage>b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</usedLanguage>
-        <usedLanguage>d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext)</usedLanguage>
-        <usedLanguage>a2ea22de-b72c-4ba2-8eb5-b87d86146d6b(jetbrains.mps.typecheck)</usedLanguage>
-      </usedLanguages>
-      <usedDevKits>
-        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-      </usedDevKits>
-      <mapping-priorities />
-    </generator>
-  </generators>
-  <sourcePath />
-  <usedDevKits>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-  </usedDevKits>
-  <runtime>
-    <dependency reexport="false">a3529a8c-f4ff-4125-865c-391bcc490358(jetbrains.mps.typecheck.runtime)</dependency>
-  </runtime>
-  <extendedLanguages />
-</language>
-
diff --git a/languages/jetbrains.mps.typecheck/languageModels/behavior.mps b/languages/jetbrains.mps.typecheck/languageModels/behavior.mps
deleted file mode 100644
index ae05e1c9..00000000
--- a/languages/jetbrains.mps.typecheck/languageModels/behavior.mps
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:2bda9bc4-789a-453b-b741-f40c2b297870(jetbrains.mps.typecheck.behavior)">
-  <persistence version="8" />
-  <language namespace="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" />
-  <devkit namespace="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-</model>
-
diff --git a/languages/jetbrains.mps.typecheck/languageModels/constraints.mps b/languages/jetbrains.mps.typecheck/languageModels/constraints.mps
deleted file mode 100644
index 79c79847..00000000
--- a/languages/jetbrains.mps.typecheck/languageModels/constraints.mps
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:8a5e78e0-cee7-4cb4-a599-093e3dc325b5(jetbrains.mps.typecheck.constraints)">
-  <persistence version="8" />
-  <language namespace="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1(jetbrains.mps.lang.constraints)" />
-  <devkit namespace="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-</model>
-
diff --git a/languages/jetbrains.mps.typecheck/languageModels/editor.mps b/languages/jetbrains.mps.typecheck/languageModels/editor.mps
deleted file mode 100644
index d2c9d620..00000000
--- a/languages/jetbrains.mps.typecheck/languageModels/editor.mps
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:add905e6-3aa9-4653-bfcf-2a8712113b8c(jetbrains.mps.typecheck.editor)">
-  <persistence version="8" />
-  <language namespace="18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)" />
-  <devkit namespace="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-</model>
-
diff --git a/languages/jetbrains.mps.typecheck/languageModels/structure.mps b/languages/jetbrains.mps.typecheck/languageModels/structure.mps
deleted file mode 100644
index 6c668479..00000000
--- a/languages/jetbrains.mps.typecheck/languageModels/structure.mps
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:a7931f7a-022d-4a0d-ba01-3fcb488fbeb1(jetbrains.mps.typecheck.structure)">
-  <persistence version="8" />
-  <language namespace="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" />
-  <devkit namespace="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-</model>
-
diff --git a/languages/jetbrains.mps.typecheck/languageModels/typesystem.mps b/languages/jetbrains.mps.typecheck/languageModels/typesystem.mps
deleted file mode 100644
index dd65deae..00000000
--- a/languages/jetbrains.mps.typecheck/languageModels/typesystem.mps
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:a3fe07be-b564-4611-b0b2-38befe177cb9(jetbrains.mps.typecheck.typesystem)">
-  <persistence version="8" />
-  <language namespace="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" />
-  <devkit namespace="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-</model>
-
diff --git a/languages/jetbrains.mps.typecheck/sandbox/jetbrains.mps.typecheck.sandbox.msd b/languages/jetbrains.mps.typecheck/sandbox/jetbrains.mps.typecheck.sandbox.msd
deleted file mode 100644
index dbc1e4ef..00000000
--- a/languages/jetbrains.mps.typecheck/sandbox/jetbrains.mps.typecheck.sandbox.msd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.typecheck.sandbox" uuid="f4cae422-6d4a-4e55-bdf7-c5e41f0db57c" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <sourcePath />
-  <usedLanguages>
-    <usedLanguage>ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</usedLanguage>
-    <usedLanguage>a2ea22de-b72c-4ba2-8eb5-b87d86146d6b(jetbrains.mps.typecheck)</usedLanguage>
-  </usedLanguages>
-</solution>
-
diff --git a/languages/jetbrains.mps.typecheck/sandbox/models/jetbrains/mps/typecheck/sandbox.mps b/languages/jetbrains.mps.typecheck/sandbox/models/jetbrains/mps/typecheck/sandbox.mps
deleted file mode 100644
index e00616fe..00000000
--- a/languages/jetbrains.mps.typecheck/sandbox/models/jetbrains/mps/typecheck/sandbox.mps
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model modelUID="r:e3157504-c93d-48c6-971a-66a5e8b2248e(jetbrains.mps.typecheck.sandbox)">
-  <persistence version="8" />
-  <language namespace="a2ea22de-b72c-4ba2-8eb5-b87d86146d6b(jetbrains.mps.typecheck)" />
-  <language namespace="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" />
-</model>
-