diff --git a/.mps/modules.xml b/.mps/modules.xml
index 63208bb1..8844dc43 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -10,8 +10,6 @@
-
-
@@ -43,11 +41,10 @@
-
-
-
+
+
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/jetbrains.mps.typechecking.testlangCycle1.mpl b/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/jetbrains.mps.typechecking.testlangCycle1.mpl
deleted file mode 100644
index c25cfd3c..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/jetbrains.mps.typechecking.testlangCycle1.mpl
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- a32939ba-878b-4531-93ec-c5e14424159b(jetbrains.mps.typechecking.testlangCycle2)
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.behavior.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.behavior.mps
deleted file mode 100644
index a0a6a0b9..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.behavior.mps
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.constraints.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.constraints.mps
deleted file mode 100644
index 6ca6bc2e..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.constraints.mps
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.editor.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.editor.mps
deleted file mode 100644
index 0c552725..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.editor.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.structure.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.structure.mps
deleted file mode 100644
index bfbb87ec..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.structure.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.types.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.types.mps
deleted file mode 100644
index 25ec00ac..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.types.mps
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.typesystem.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.typesystem.mps
deleted file mode 100644
index 79bc5742..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle1/models/jetbrains.mps.typechecking.testlangCycle1.typesystem.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/jetbrains.mps.typechecking.testlangCycle2.mpl b/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/jetbrains.mps.typechecking.testlangCycle2.mpl
deleted file mode 100644
index 8d27c83b..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/jetbrains.mps.typechecking.testlangCycle2.mpl
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- f2222c61-5f49-4d55-bb88-a14d6fed1be7(jetbrains.mps.typechecking.testlangCycle1)
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.behavior.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.behavior.mps
deleted file mode 100644
index 06e4fd07..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.behavior.mps
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.constraints.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.constraints.mps
deleted file mode 100644
index ba8bb02b..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.constraints.mps
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.editor.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.editor.mps
deleted file mode 100644
index 0e5be040..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.editor.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.structure.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.structure.mps
deleted file mode 100644
index 5a6f70d2..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.structure.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.types.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.types.mps
deleted file mode 100644
index 8ef5278f..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.types.mps
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.typesystem.mps b/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.typesystem.mps
deleted file mode 100644
index 11fc9fcb..00000000
--- a/coderules/languages/jetbrains.mps.typechecking.testlangCycle2/models/jetbrains.mps.typechecking.testlangCycle2.typesystem.mps
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.langCycle.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.langCycle.mps
deleted file mode 100644
index 3af6232c..00000000
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.langCycle.mps
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index c30b5e27..d4286e66 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -42,7 +42,6 @@
-