From 0ce5e4813c91dd6e18f33bd8c5fe38fc69faba3b Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 13 Apr 2020 13:10:43 +0200
Subject: [PATCH] Drop all deprecated concepts from j.m.logic lang.

---
 .../generator/template/main@generator.mps     | 244 --------------
 .../languageModels/constraints.mps            |  78 -----
 .../languageModels/editor.mps                 | 304 ------------------
 .../languageModels/intentions.mps             | 138 +-------
 .../jetbrains.mps.logic.enumMigration.mps     | 274 ----------------
 .../languageModels/structure.mps              | 170 ----------
 .../languageModels/typesystem.mps             | 173 ----------
 7 files changed, 1 insertion(+), 1380 deletions(-)
 delete mode 100644 coderules/languages/jetbrains.mps.logic/languageModels/jetbrains.mps.logic.enumMigration.mps

diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 519ba685..9f5925f0 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -452,52 +452,6 @@
   <node concept="bUwia" id="5JQSuNswW1q">
     <property role="TrG5h" value="ast" />
     <property role="3GE5qa" value="" />
-    <node concept="3aamgX" id="28ktUhrk7Yi" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
-      <node concept="1Koe21" id="74q$MmSc8Yd" role="1lVwrX">
-        <node concept="3clFbS" id="74q$MmSc8Yj" role="1Koe22">
-          <node concept="3cpWs8" id="74q$MmSc8Yq" role="3cqZAp">
-            <node concept="3cpWsn" id="74q$MmSc8Yr" role="3cpWs9">
-              <property role="TrG5h" value="logical" />
-              <node concept="3uibUv" id="74q$MmSc8Ys" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="74q$MmSc8YE" role="3cqZAp">
-            <node concept="2OqwBi" id="28ktUhrkeJN" role="3clFbG">
-              <node concept="2OqwBi" id="28ktUhrke9D" role="2Oq$k0">
-                <node concept="liA8E" id="28ktUhrkepZ" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
-                </node>
-                <node concept="37vLTw" id="74q$MmSc9e2" role="2Oq$k0">
-                  <ref role="3cqZAo" node="74q$MmSc8Yr" resolve="logical" />
-                  <node concept="29HgVG" id="74q$MmSc9hU" role="lGtFl">
-                    <node concept="3NFfHV" id="74q$MmSc9iR" role="3NFExx">
-                      <node concept="3clFbS" id="74q$MmSc9iS" role="2VODD2">
-                        <node concept="3clFbF" id="74q$MmSc9nb" role="3cqZAp">
-                          <node concept="2OqwBi" id="74q$MmSc9wV" role="3clFbG">
-                            <node concept="30H73N" id="74q$MmSc9na" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="74q$MmScaPT" role="2OqNvi">
-                              <ref role="3Tt5mk" to="5j4j:28ktUhrjrp0" resolve="logical" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="28ktUhrkfqr" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
-              </node>
-              <node concept="raruj" id="74q$MmSc9gY" role="lGtFl" />
-            </node>
-          </node>
-          <node concept="3clFbH" id="74q$MmSc8Y_" role="3cqZAp" />
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="1pt0VTMwlBi" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:6$jH9oLmUCq" resolve="DataNodeExpression" />
       <node concept="gft3U" id="5WBVN_MEXNj" role="1lVwrX">
@@ -544,27 +498,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="428_4iYhBrH" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:428_4iYhwbR" resolve="ListExpression" />
-      <node concept="gft3U" id="428_4iYhEyT" role="1lVwrX">
-        <node concept="10Nm6u" id="5WBVN_MJhDN" role="gfFT$">
-          <node concept="29HgVG" id="5WBVN_MJhDX" role="lGtFl">
-            <node concept="3NFfHV" id="5WBVN_MJhE3" role="3NFExx">
-              <node concept="3clFbS" id="5WBVN_MJhE4" role="2VODD2">
-                <node concept="3clFbF" id="5WBVN_MJhHs" role="3cqZAp">
-                  <node concept="2OqwBi" id="5WBVN_MJhR1" role="3clFbG">
-                    <node concept="30H73N" id="5WBVN_MJhHr" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="5WBVN_MJi1R" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:5WBVN_MJ9$7" resolve="literal" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="49obaclcRBA" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
       <node concept="gft3U" id="49obacld2yF" role="1lVwrX">
@@ -653,39 +586,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="5WBVN_MJ51w" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:5WBVN_MJ50y" resolve="ListLiteral" />
-      <node concept="gft3U" id="5WBVN_MJ8nE" role="1lVwrX">
-        <node concept="2YIFZM" id="5WBVN_MJ8nF" role="gfFT$">
-          <ref role="1Pybhc" to="6exd:6YPNC4OECgm" resolve="ListRole" />
-          <ref role="37wK5l" to="6exd:6YPNC4OEDj2" resolve="create" />
-          <node concept="2YIFZM" id="5WBVN_MJ8nG" role="37wK5m">
-            <ref role="1Pybhc" to="6exd:6YPNC4OECgm" resolve="ListRole" />
-            <ref role="37wK5l" to="6exd:428_4iYQuPn" resolve="listSymbol" />
-          </node>
-          <node concept="2YIFZM" id="5WBVN_MJ8nH" role="37wK5m">
-            <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-            <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-            <node concept="10Nm6u" id="5WBVN_MJ8nI" role="37wK5m">
-              <node concept="2b32R4" id="5WBVN_MJ8nJ" role="lGtFl">
-                <node concept="3JmXsc" id="5WBVN_MJ8nK" role="2P8S$">
-                  <node concept="3clFbS" id="5WBVN_MJ8nL" role="2VODD2">
-                    <node concept="3clFbF" id="5WBVN_MJ8nM" role="3cqZAp">
-                      <node concept="2OqwBi" id="5WBVN_MJ8nN" role="3clFbG">
-                        <node concept="30H73N" id="5WBVN_MJ8nO" role="2Oq$k0" />
-                        <node concept="3Tsc0h" id="5WBVN_MJ8nP" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:5WBVN_MJ50Y" resolve="contents" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="4OKkcneVYzR" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
       <node concept="14YyZ8" id="4OKkcneVZCA" role="1lVwrX">
@@ -1258,71 +1158,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="5NAQwIkRG1m" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
-      <node concept="30G5F_" id="5NAQwIkRKxX" role="30HLyM">
-        <node concept="3clFbS" id="5NAQwIkRKxY" role="2VODD2">
-          <node concept="3clFbF" id="5NAQwIkRLs$" role="3cqZAp">
-            <node concept="2OqwBi" id="5NAQwIkRMFR" role="3clFbG">
-              <node concept="2OqwBi" id="5NAQwIkRLTz" role="2Oq$k0">
-                <node concept="30H73N" id="5NAQwIkRLsz" role="2Oq$k0" />
-                <node concept="3CFZ6_" id="5NAQwIkRMaI" role="2OqNvi">
-                  <node concept="3CFYIy" id="5NAQwIkRMlY" role="3CFYIz">
-                    <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3w_OXm" id="5NAQwIkRNbY" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="gft3U" id="5NAQwIkRNr4" role="1lVwrX">
-        <node concept="2YIFZM" id="5NAQwIkRNr5" role="gfFT$">
-          <ref role="1Pybhc" to="6exd:6YPNC4OECgm" resolve="ListRole" />
-          <ref role="37wK5l" to="6exd:6YPNC4OEDj2" resolve="create" />
-          <node concept="2YIFZM" id="5NAQwIkRNr6" role="37wK5m">
-            <ref role="37wK5l" to="6exd:6YPNC4NZlZx" resolve="symbol" />
-            <ref role="1Pybhc" to="6exd:6YPNC4ODVle" resolve="RoleNode" />
-            <node concept="Xl_RD" id="5NAQwIkRNr7" role="37wK5m">
-              <property role="Xl_RC" value="name" />
-              <node concept="17Uvod" id="5NAQwIkRNr8" role="lGtFl">
-                <property role="2qtEX9" value="value" />
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <node concept="3zFVjK" id="5NAQwIkRNr9" role="3zH0cK">
-                  <node concept="3clFbS" id="5NAQwIkRNra" role="2VODD2">
-                    <node concept="3clFbF" id="5NAQwIkRNrb" role="3cqZAp">
-                      <node concept="2OqwBi" id="5NAQwIkRNrc" role="3clFbG">
-                        <node concept="30H73N" id="5NAQwIkRNrd" role="2Oq$k0" />
-                        <node concept="3TrcHB" id="5NAQwIkRNre" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="10Nm6u" id="5NAQwIkRNrf" role="37wK5m">
-            <node concept="29HgVG" id="5NAQwIkSclR" role="lGtFl">
-              <node concept="3NFfHV" id="5NAQwIkScxL" role="3NFExx">
-                <node concept="3clFbS" id="5NAQwIkScxM" role="2VODD2">
-                  <node concept="3clFbF" id="5NAQwIkScKP" role="3cqZAp">
-                    <node concept="2OqwBi" id="5NAQwIkScVJ" role="3clFbG">
-                      <node concept="30H73N" id="5NAQwIkScKO" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="5NAQwIkSdyk" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:5NAQwIkRIYU" resolve="list" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="1pt0VTMwUQ$" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
       <node concept="30G5F_" id="3ec9Qj4MejB" role="30HLyM">
@@ -1410,64 +1245,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="PltxfI8BYF" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:PltxfHULAb" resolve="ListNodeCons" />
-      <node concept="gft3U" id="PltxfI8BYG" role="1lVwrX">
-        <node concept="2YIFZM" id="PltxfI8F1U" role="gfFT$">
-          <ref role="37wK5l" to="6exd:PltxfHVDa3" resolve="createConsList" />
-          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-          <node concept="10Nm6u" id="PltxfI8FcP" role="37wK5m">
-            <node concept="29HgVG" id="PltxfI8FeB" role="lGtFl">
-              <node concept="3NFfHV" id="PltxfI8FeC" role="3NFExx">
-                <node concept="3clFbS" id="PltxfI8FeD" role="2VODD2">
-                  <node concept="3clFbF" id="PltxfI8FeJ" role="3cqZAp">
-                    <node concept="2OqwBi" id="PltxfI8FeE" role="3clFbG">
-                      <node concept="3TrEf2" id="PltxfI8FeH" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:PltxfHVVwQ" resolve="tail" />
-                      </node>
-                      <node concept="30H73N" id="PltxfI8FeI" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="10Nm6u" id="PltxfI8F1V" role="37wK5m">
-            <node concept="2b32R4" id="PltxfI8F1W" role="lGtFl">
-              <node concept="3JmXsc" id="PltxfI8F1X" role="2P8S$">
-                <node concept="3clFbS" id="PltxfI8F1Y" role="2VODD2">
-                  <node concept="3clFbF" id="PltxfI8F1Z" role="3cqZAp">
-                    <node concept="2OqwBi" id="PltxfI8F20" role="3clFbG">
-                      <node concept="3Tsc0h" id="PltxfI8F21" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
-                      </node>
-                      <node concept="30H73N" id="PltxfI8F22" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="PltxfI8BYQ" role="30HLyM">
-        <node concept="3clFbS" id="PltxfI8BYR" role="2VODD2">
-          <node concept="3clFbF" id="PltxfI8BYS" role="3cqZAp">
-            <node concept="2OqwBi" id="PltxfI8BYT" role="3clFbG">
-              <node concept="2OqwBi" id="PltxfI8BYU" role="2Oq$k0">
-                <node concept="30H73N" id="PltxfI8BYV" role="2Oq$k0" />
-                <node concept="3CFZ6_" id="PltxfI8BYW" role="2OqNvi">
-                  <node concept="3CFYIy" id="PltxfI8BYX" role="3CFYIz">
-                    <ref role="3CFYIx" to="5j4j:dfChU1zo4B" resolve="Splice" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3w_OXm" id="PltxfI8BYY" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="1fvYCPAnp8A" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:1fvYCPAmuWc" resolve="ConsListNode" />
       <node concept="30G5F_" id="1fvYCPAnssL" role="30HLyM">
@@ -1571,27 +1348,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="1mP5b6jMx78" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:7E86$tKt5sV" resolve="ExpressionLogicalVariable" />
-      <node concept="gft3U" id="1mP5b6jMxSQ" role="1lVwrX">
-        <node concept="10Nm6u" id="1mP5b6jMxUC" role="gfFT$">
-          <node concept="29HgVG" id="1mP5b6jMxXk" role="lGtFl">
-            <node concept="3NFfHV" id="1mP5b6jMxXl" role="3NFExx">
-              <node concept="3clFbS" id="1mP5b6jMxXm" role="2VODD2">
-                <node concept="3clFbF" id="1mP5b6jMxXs" role="3cqZAp">
-                  <node concept="2OqwBi" id="1mP5b6jMxXn" role="3clFbG">
-                    <node concept="3TrEf2" id="1mP5b6jMxXq" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:7E86$tKt5BI" resolve="expression" />
-                    </node>
-                    <node concept="30H73N" id="1mP5b6jMxXr" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="1mP5b6jO$89" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
       <node concept="1Koe21" id="1mP5b6jOPxk" role="1lVwrX">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index ecc912b2..9f3af231 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -16,7 +16,6 @@
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -30,7 +29,6 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
@@ -139,11 +137,8 @@
     </language>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
       <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
-      <concept id="6702802731807420587" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAParent" flags="ig" index="9SLcT" />
       <concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
       <concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
-      <concept id="4303308395523343364" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_link" flags="ng" index="2DA6wF" />
-      <concept id="4303308395523096213" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_childConcept" flags="ng" index="2DD5aU" />
       <concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
         <reference id="1147467295099" name="applicableProperty" index="EomxK" />
         <child id="1212097481299" name="propertyValidator" index="QCWH9" />
@@ -154,7 +149,6 @@
       <concept id="1163200647017" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_referenceNode" flags="nn" index="3kakTB" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
-        <child id="6702802731807532712" name="canBeParent" index="9SGkU" />
         <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
         <child id="1213098023997" name="property" index="1MhHOB" />
         <child id="1213100494875" name="referent" index="1Mr941" />
@@ -220,15 +214,6 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
-        <child id="6039268229365417680" name="defaultBlock" index="1prKM_" />
-        <child id="5944356402132808753" name="case" index="1_3QMm" />
-        <child id="5944356402132808752" name="expression" index="1_3QMn" />
-      </concept>
-      <concept id="5944356402132808754" name="jetbrains.mps.lang.smodel.structure.SubconceptCase" flags="ng" index="1_3QMl">
-        <child id="1163670677455" name="concept" index="3Kbmr1" />
-        <child id="1163670683720" name="body" index="3Kbo56" />
-      </concept>
       <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
         <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
       </concept>
@@ -942,69 +927,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="PltxfHX6cY">
-    <property role="3GE5qa" value="dataform" />
-    <ref role="1M2myG" to="5j4j:PltxfHULAb" resolve="ListNodeCons" />
-    <node concept="9SLcT" id="PltxfHXkE9" role="9SGkU">
-      <node concept="3clFbS" id="PltxfHXkEa" role="2VODD2">
-        <node concept="3clFbJ" id="PltxfHX6K$" role="3cqZAp">
-          <node concept="2OqwBi" id="PltxfHX83v" role="3clFbw">
-            <node concept="2OqwBi" id="PltxfHX7hf" role="2Oq$k0">
-              <node concept="2DA6wF" id="PltxfHX6We" role="2Oq$k0" />
-              <node concept="liA8E" id="PltxfHX7Gl" role="2OqNvi">
-                <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
-              </node>
-            </node>
-            <node concept="liA8E" id="PltxfHX8_T" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-              <node concept="Xl_RD" id="PltxfHX8Iy" role="37wK5m">
-                <property role="Xl_RC" value="tail" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbS" id="PltxfHX6KA" role="3clFbx">
-            <node concept="1_3QMa" id="PltxfHXgpQ" role="3cqZAp">
-              <node concept="2DD5aU" id="PltxfHXgze" role="1_3QMn" />
-              <node concept="1_3QMl" id="PltxfHXgRK" role="1_3QMm">
-                <node concept="3gn64h" id="PltxfHXi7R" role="3Kbmr1">
-                  <ref role="3gnhBz" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
-                </node>
-                <node concept="3clFbS" id="PltxfHXgRM" role="3Kbo56" />
-              </node>
-              <node concept="1_3QMl" id="PltxfHXiiX" role="1_3QMm">
-                <node concept="3gn64h" id="PltxfHXiBJ" role="3Kbmr1">
-                  <ref role="3gnhBz" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
-                </node>
-                <node concept="3clFbS" id="PltxfHXij1" role="3Kbo56" />
-              </node>
-              <node concept="3clFbS" id="PltxfHXh11" role="1prKM_">
-                <node concept="3cpWs6" id="PltxfHXh_u" role="3cqZAp">
-                  <node concept="3clFbT" id="PltxfHXhJn" role="3cqZAk" />
-                </node>
-              </node>
-              <node concept="1_3QMl" id="PltxfHXjdo" role="1_3QMm">
-                <node concept="3gn64h" id="PltxfHXjmT" role="3Kbmr1">
-                  <ref role="3gnhBz" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
-                </node>
-                <node concept="3clFbS" id="PltxfHXjds" role="3Kbo56">
-                  <node concept="3cpWs6" id="PltxfHXjJl" role="3cqZAp">
-                    <node concept="3clFbT" id="PltxfHXjLa" role="3cqZAk">
-                      <property role="3clFbU" value="true" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="PltxfHX934" role="3cqZAp">
-          <node concept="3clFbT" id="PltxfHX97c" role="3cqZAk">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="4vr5SAprtjH">
     <property role="3GE5qa" value="term" />
     <ref role="1M2myG" to="5j4j:JOGAOsxaC9" resolve="DataFormDeclaration" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 6d298d46..4a0bd129 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -365,7 +365,6 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
@@ -568,14 +567,10 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -990,23 +985,6 @@
       <node concept="l2Vlx" id="2q_78a9c7Q_" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="7E86$tKt5HF">
-    <property role="3GE5qa" value="logical.item" />
-    <ref role="1XX52x" to="5j4j:7E86$tKt5sV" resolve="ExpressionLogicalVariable" />
-    <node concept="3EZMnI" id="7E86$tKt68D" role="2wV5jI">
-      <node concept="3F0ifn" id="6Ng87FPWMwT" role="3EZMnx">
-        <property role="3F0ifm" value="$" />
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-        <node concept="11LMrY" id="6Ng87FPWMAV" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="7E86$tKt6my" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:7E86$tKt5BI" resolve="expression" />
-      </node>
-      <node concept="l2Vlx" id="7E86$tKt68G" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7E86$tKtiJM">
     <property role="3GE5qa" value="logical.variable" />
     <ref role="1XX52x" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
@@ -2796,69 +2774,6 @@
       <property role="TrG5h" value="EXPRESSION" />
     </node>
   </node>
-  <node concept="24kQdi" id="5NAQwIkRIYW">
-    <property role="3GE5qa" value="dataform.role" />
-    <ref role="1XX52x" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
-    <node concept="3EZMnI" id="5NAQwIkRIYY" role="2wV5jI">
-      <node concept="3F0A7n" id="5NAQwIkRIYZ" role="3EZMnx">
-        <ref role="1k5W1q" to="tpen:hgVSdfU" resolve="StringLiteral" />
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      </node>
-      <node concept="3F0ifn" id="5NAQwIkRIZ1" role="3EZMnx">
-        <property role="3F0ifm" value=":" />
-        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
-        <node concept="11L4FC" id="5NAQwIkRIZ2" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="5NAQwIkSl2c" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:5NAQwIkRIYU" resolve="list" />
-      </node>
-      <node concept="l2Vlx" id="5NAQwIkRIZa" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="428_4iYhwbX">
-    <property role="3GE5qa" value="dataform.expression" />
-    <ref role="1XX52x" to="5j4j:428_4iYhwbR" resolve="ListExpression" />
-    <node concept="3EZMnI" id="428_4iYhAer" role="2wV5jI">
-      <node concept="3F1sOY" id="5WBVN_MJfMF" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:5WBVN_MJ9$7" resolve="literal" />
-      </node>
-      <node concept="l2Vlx" id="428_4iYhAeu" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="5WBVN_MJ50z">
-    <property role="3GE5qa" value="logical.item" />
-    <ref role="1XX52x" to="5j4j:5WBVN_MJ50y" resolve="ListLiteral" />
-    <node concept="3EZMnI" id="5WBVN_MJ50C" role="2wV5jI">
-      <node concept="3F0ifn" id="5WBVN_MJ50D" role="3EZMnx">
-        <property role="3F0ifm" value="[" />
-        <node concept="11LMrY" id="5WBVN_MJ50E" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F2HdR" id="5WBVN_MJ50F" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <ref role="1NtTu8" to="5j4j:5WBVN_MJ50Y" resolve="contents" />
-        <node concept="l2Vlx" id="5WBVN_MJ50G" role="2czzBx" />
-        <node concept="tppnM" id="5WBVN_MJ50H" role="sWeuL">
-          <node concept="11L4FC" id="5WBVN_MJ50I" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="5WBVN_MJ50J" role="2czzBI">
-          <property role="ilYzB" value="&lt;empty&gt;" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="5WBVN_MJ50K" role="3EZMnx">
-        <property role="3F0ifm" value="]" />
-        <node concept="11L4FC" id="5WBVN_MJ50L" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="5WBVN_MJ50M" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="5WBVN_MPIur">
     <property role="3GE5qa" value="logical.item" />
     <ref role="1XX52x" to="5j4j:5WBVN_MESCN" resolve="DataNodeLiteral" />
@@ -2913,28 +2828,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="28ktUhrjpi3">
-    <property role="3GE5qa" value="logical" />
-    <ref role="1XX52x" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
-    <node concept="3EZMnI" id="28ktUhrjpi5" role="2wV5jI">
-      <node concept="PMmxH" id="28ktUhrjpic" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-      </node>
-      <node concept="3F0ifn" id="28ktUhrjpih" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
-      <node concept="3F1sOY" id="28ktUhrj_l2" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:28ktUhrjrp0" resolve="logical" />
-      </node>
-      <node concept="3F0ifn" id="28ktUhrjpip" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-      </node>
-      <node concept="l2Vlx" id="28ktUhrjpi8" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="49obaclcC1Y">
     <property role="3GE5qa" value="logical.item.expression" />
     <ref role="1XX52x" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
@@ -4073,10 +3966,6 @@
     </node>
     <node concept="3VyMlK" id="2L$SfABlcrT" role="3ft7WO" />
   </node>
-  <node concept="3p36aQ" id="2L$SfABkf1z">
-    <property role="3GE5qa" value="dataform.role" />
-    <ref role="aqKnT" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
-  </node>
   <node concept="24kQdi" id="PltxfHNefA">
     <property role="3GE5qa" value="dataform" />
     <ref role="1XX52x" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
@@ -4087,149 +3976,6 @@
       <node concept="l2Vlx" id="PltxfHNeGi" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="PltxfHUMEE">
-    <property role="3GE5qa" value="dataform" />
-    <ref role="1XX52x" to="5j4j:PltxfHULAb" resolve="ListNodeCons" />
-    <node concept="3EZMnI" id="PltxfHUMIv" role="2wV5jI">
-      <node concept="3F0ifn" id="PltxfIhfLC" role="3EZMnx">
-        <property role="3F0ifm" value="[" />
-        <ref role="1k5W1q" to="tpen:hXb$RYA" resolve="LeftBracket" />
-        <node concept="11L4FC" id="PltxfIh_an" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="11LMrY" id="PltxfIh_ao" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3mYdg7" id="PltxfIh_ap" role="3F10Kt">
-          <property role="1413C4" value="list" />
-        </node>
-      </node>
-      <node concept="3F2HdR" id="PltxfHUMQc" role="3EZMnx">
-        <property role="2czwfO" value=" :" />
-        <ref role="1NtTu8" to="5j4j:1OShD0HAZ38" resolve="contents" />
-        <node concept="l2Vlx" id="PltxfHUMQe" role="2czzBx" />
-        <node concept="34QqEe" id="PltxfHUPVR" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="4$FPG" id="PltxfI7TQi" role="4_6I_">
-          <node concept="3clFbS" id="PltxfI7TQj" role="2VODD2">
-            <node concept="3clFbF" id="PltxfI7TSj" role="3cqZAp">
-              <node concept="2ShNRf" id="PltxfI7TSh" role="3clFbG">
-                <node concept="3zrR0B" id="PltxfI7Us9" role="2ShVmc">
-                  <node concept="3Tqbb2" id="PltxfI7Usb" role="3zrR0E">
-                    <ref role="ehGHo" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3F0ifn" id="68ncUima9zg" role="2czzBI">
-          <property role="ilYzB" value="&lt;no head&gt;" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="PltxfHVXbj" role="3EZMnx">
-        <property role="3F0ifm" value=":" />
-      </node>
-      <node concept="3F1sOY" id="PltxfHVXqM" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:PltxfHVVwQ" resolve="tail" />
-      </node>
-      <node concept="3F0ifn" id="PltxfIhfXw" role="3EZMnx">
-        <property role="3F0ifm" value="]" />
-        <ref role="1k5W1q" to="tpen:hXb$V4T" resolve="RightBracket" />
-        <node concept="11L4FC" id="PltxfIh_CP" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3mYdg7" id="PltxfIh_CQ" role="3F10Kt">
-          <property role="1413C4" value="list" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="PltxfHUMIy" role="2iSdaV" />
-      <node concept="VPM3Z" id="PltxfHUOo5" role="3F10Kt" />
-    </node>
-  </node>
-  <node concept="3p36aQ" id="PltxfHURL0">
-    <property role="3GE5qa" value="dataform" />
-    <ref role="aqKnT" to="5j4j:PltxfHULAb" resolve="ListNodeCons" />
-    <node concept="3eGOop" id="PltxfHUS42" role="3ft7WO">
-      <node concept="ucgPf" id="PltxfHUS44" role="3aKz83">
-        <node concept="3clFbS" id="PltxfHUS46" role="2VODD2">
-          <node concept="3cpWs8" id="PltxfIeLKN" role="3cqZAp">
-            <node concept="3cpWsn" id="PltxfIeLKQ" role="3cpWs9">
-              <property role="TrG5h" value="newnode" />
-              <node concept="3Tqbb2" id="PltxfIeLKM" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:PltxfHULAb" resolve="ListNodeCons" />
-              </node>
-              <node concept="2ShNRf" id="PltxfIeM2L" role="33vP2m">
-                <node concept="3zrR0B" id="PltxfIeM2M" role="2ShVmc">
-                  <node concept="3Tqbb2" id="PltxfIeM2N" role="3zrR0E">
-                    <ref role="ehGHo" to="5j4j:PltxfHULAb" resolve="ListNodeCons" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="PltxfIeXW5" role="3cqZAp" />
-          <node concept="3cpWs8" id="PltxfIeSIS" role="3cqZAp">
-            <node concept="3cpWsn" id="PltxfIeSIV" role="3cpWs9">
-              <property role="TrG5h" value="defaultHead" />
-              <node concept="3Tqbb2" id="PltxfIeSIQ" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
-              </node>
-              <node concept="2ShNRf" id="PltxfIeTeo" role="33vP2m">
-                <node concept="3zrR0B" id="PltxfIeTKN" role="2ShVmc">
-                  <node concept="3Tqbb2" id="PltxfIeTKP" role="3zrR0E">
-                    <ref role="ehGHo" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="PltxfIeMxG" role="3cqZAp">
-            <node concept="2OqwBi" id="PltxfIeOvS" role="3clFbG">
-              <node concept="2OqwBi" id="PltxfIeMI8" role="2Oq$k0">
-                <node concept="37vLTw" id="PltxfIeMxE" role="2Oq$k0">
-                  <ref role="3cqZAo" node="PltxfIeLKQ" resolve="newnode" />
-                </node>
-                <node concept="3Tsc0h" id="PltxfIeN3G" role="2OqNvi">
-                  <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
-                </node>
-              </node>
-              <node concept="TSZUe" id="PltxfIeW6h" role="2OqNvi">
-                <node concept="37vLTw" id="PltxfIeWk4" role="25WWJ7">
-                  <ref role="3cqZAo" node="PltxfIeSIV" resolve="defaultHead" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="PltxfIeWG8" role="3cqZAp">
-            <node concept="2OqwBi" id="PltxfIeWTW" role="3clFbG">
-              <node concept="37vLTw" id="PltxfIeWG6" role="2Oq$k0">
-                <ref role="3cqZAo" node="PltxfIeSIV" resolve="defaultHead" />
-              </node>
-              <node concept="1OKiuA" id="PltxfIeX5w" role="2OqNvi">
-                <node concept="1Q80Hx" id="PltxfIeXfu" role="lBI5i" />
-                <node concept="2B6iha" id="PltxfIeXxD" role="lGT1i">
-                  <property role="1lyBwo" value="1S2pyLby17G/firstEditable" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="PltxfIeY30" role="3cqZAp" />
-          <node concept="3clFbF" id="PltxfIeMoE" role="3cqZAp">
-            <node concept="37vLTw" id="PltxfIeMoC" role="3clFbG">
-              <ref role="3cqZAo" node="PltxfIeLKQ" resolve="newnode" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16NfWO" id="PltxfHV3U3" role="upBLP">
-        <node concept="2h3Zct" id="PltxfHV4iN" role="16NeZM">
-          <property role="2h4Kg1" value="[:" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3p36aQ" id="PltxfIrOTO">
     <property role="3GE5qa" value="dataform" />
     <ref role="aqKnT" to="5j4j:PltxfHNb9C" resolve="LogicalDataForm" />
@@ -4629,10 +4375,6 @@
     </node>
     <node concept="3VyMlK" id="7zIaasjAP8G" role="3ft7WO" />
   </node>
-  <node concept="3p36aQ" id="7zIaasjVjl3">
-    <property role="3GE5qa" value="logical" />
-    <ref role="aqKnT" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
-  </node>
   <node concept="3p36aQ" id="hYA4RDFy_E">
     <property role="3GE5qa" value="logical.item" />
     <ref role="aqKnT" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
@@ -4973,52 +4715,6 @@
       </node>
     </node>
   </node>
-  <node concept="IW6AY" id="hYA4REMCYX">
-    <property role="3GE5qa" value="logical.item" />
-    <ref role="aqKnT" to="5j4j:7E86$tKt5sV" resolve="ExpressionLogicalVariable" />
-    <node concept="1Qtc8_" id="hYA4REMISA" role="IW6Ez">
-      <node concept="3cWJ9i" id="hYA4REMISB" role="1Qtc8$">
-        <node concept="CtIbL" id="hYA4REMISC" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
-        </node>
-      </node>
-      <node concept="mvV$s" id="hYA4REMISD" role="1Qtc8A">
-        <node concept="mvVNg" id="hYA4REMISE" role="mvV$0">
-          <node concept="3clFbS" id="hYA4REMISF" role="2VODD2">
-            <node concept="3clFbF" id="hYA4REMISG" role="3cqZAp">
-              <node concept="2OqwBi" id="hYA4REMISH" role="3clFbG">
-                <node concept="7Obwk" id="hYA4REMISI" role="2Oq$k0" />
-                <node concept="1mfA1w" id="hYA4REMISJ" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1Qtc8_" id="hYA4REMISK" role="IW6Ez">
-      <node concept="3cWJ9i" id="hYA4REMISL" role="1Qtc8$">
-        <node concept="CtIbL" id="hYA4REMISM" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
-        </node>
-      </node>
-      <node concept="mvV$s" id="hYA4REMISN" role="1Qtc8A">
-        <node concept="mvVNg" id="hYA4REMISO" role="mvV$0">
-          <node concept="3clFbS" id="hYA4REMISP" role="2VODD2">
-            <node concept="3clFbF" id="hYA4REMISQ" role="3cqZAp">
-              <node concept="2OqwBi" id="hYA4REMISR" role="3clFbG">
-                <node concept="7Obwk" id="hYA4REMISS" role="2Oq$k0" />
-                <node concept="1mfA1w" id="hYA4REMIST" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3p36aQ" id="5HLeEcf272G">
-    <property role="3GE5qa" value="logical.item" />
-    <ref role="aqKnT" to="5j4j:7E86$tKt5sV" resolve="ExpressionLogicalVariable" />
-  </node>
   <node concept="312cEu" id="5HLeEcfuApQ">
     <property role="TrG5h" value="Workarounds" />
     <node concept="2tJIrI" id="5HLeEcfuAqY" role="jymVt" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
index c4849796..17f42d90 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
@@ -23,7 +23,6 @@
       <concept id="1194033889146" name="jetbrains.mps.lang.sharedConcepts.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1XNTG" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -75,12 +74,6 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
     </language>
-    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-    </language>
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions">
       <concept id="1192794744107" name="jetbrains.mps.lang.intentions.structure.IntentionDeclaration" flags="ig" index="2S6QgY" />
       <concept id="1192794782375" name="jetbrains.mps.lang.intentions.structure.DescriptionBlock" flags="in" index="2S6ZIM" />
@@ -111,17 +104,12 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
-        <reference id="1139880128956" name="concept" index="1A9B2P" />
-      </concept>
+      <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
-        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
-      </concept>
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
@@ -137,9 +125,6 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
-        <reference id="1139867957129" name="concept" index="1_rbq0" />
-      </concept>
       <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
         <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
       </concept>
@@ -150,12 +135,6 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -166,17 +145,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-    </language>
   </registry>
   <node concept="3dkpOd" id="6dMt3c55sJy">
     <property role="3GE5qa" value="dataform" />
@@ -333,110 +301,6 @@
       </node>
     </node>
   </node>
-  <node concept="2S6QgY" id="27bTNFdYJaS">
-    <property role="3GE5qa" value="dataform" />
-    <property role="TrG5h" value="ReplaceWithListNode" />
-    <ref role="2ZfgGC" to="5j4j:5WBVN_MJ50y" resolve="ListLiteral" />
-    <node concept="2S6ZIM" id="27bTNFdYJaT" role="2ZfVej">
-      <node concept="3clFbS" id="27bTNFdYJaU" role="2VODD2">
-        <node concept="3clFbF" id="27bTNFdYJSj" role="3cqZAp">
-          <node concept="Xl_RD" id="27bTNFdYJSi" role="3clFbG">
-            <property role="Xl_RC" value="Replace With ListNode Instance" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2Sbjvc" id="27bTNFdYJaV" role="2ZfgGD">
-      <node concept="3clFbS" id="27bTNFdYJaW" role="2VODD2">
-        <node concept="3cpWs8" id="27bTNFdV6II" role="3cqZAp">
-          <node concept="3cpWsn" id="27bTNFdV6IJ" role="3cpWs9">
-            <property role="TrG5h" value="contents" />
-            <node concept="2I9FWS" id="27bTNFdV6IK" role="1tU5fm">
-              <ref role="2I9WkF" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
-            </node>
-            <node concept="2OqwBi" id="27bTNFdV6IL" role="33vP2m">
-              <node concept="2Sf5sV" id="27bTNFdYK9v" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="27bTNFdV6IN" role="2OqNvi">
-                <ref role="3TtcxE" to="5j4j:5WBVN_MJ50Y" resolve="contents" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="27bTNFdV6IO" role="3cqZAp">
-          <node concept="3cpWsn" id="27bTNFdV6IP" role="3cpWs9">
-            <property role="TrG5h" value="lit" />
-            <node concept="3Tqbb2" id="27bTNFdV6IQ" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:5WBVN_MESCN" resolve="DataNodeLiteral" />
-            </node>
-            <node concept="2OqwBi" id="27bTNFdV6IR" role="33vP2m">
-              <node concept="2Sf5sV" id="27bTNFdYKDw" role="2Oq$k0" />
-              <node concept="1_qnLN" id="27bTNFdV6IT" role="2OqNvi">
-                <ref role="1_rbq0" to="5j4j:5WBVN_MESCN" resolve="DataNodeLiteral" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="27bTNFdV6IU" role="3cqZAp">
-          <node concept="3cpWsn" id="27bTNFdV6IV" role="3cpWs9">
-            <property role="TrG5h" value="list" />
-            <node concept="3Tqbb2" id="27bTNFdV6IW" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
-            </node>
-            <node concept="2OqwBi" id="27bTNFdV6IX" role="33vP2m">
-              <node concept="2OqwBi" id="27bTNFdV6IY" role="2Oq$k0">
-                <node concept="37vLTw" id="27bTNFdV6IZ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="27bTNFdV6IP" resolve="lit" />
-                </node>
-                <node concept="3TrEf2" id="27bTNFdV6J0" role="2OqNvi">
-                  <ref role="3Tt5mk" to="5j4j:5WBVN_MESCO" resolve="root" />
-                </node>
-              </node>
-              <node concept="zfrQC" id="27bTNFdV6J1" role="2OqNvi">
-                <ref role="1A9B2P" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="27bTNFdV6J2" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFdV6J3" role="3clFbG">
-            <node concept="37vLTw" id="27bTNFdV6J4" role="2Oq$k0">
-              <ref role="3cqZAo" node="27bTNFdV6IJ" resolve="contents" />
-            </node>
-            <node concept="2es0OD" id="27bTNFdV6J5" role="2OqNvi">
-              <node concept="1bVj0M" id="27bTNFdV6J6" role="23t8la">
-                <node concept="3clFbS" id="27bTNFdV6J7" role="1bW5cS">
-                  <node concept="3clFbF" id="27bTNFdV6J8" role="3cqZAp">
-                    <node concept="2OqwBi" id="27bTNFdV6J9" role="3clFbG">
-                      <node concept="2OqwBi" id="27bTNFdV6Ja" role="2Oq$k0">
-                        <node concept="37vLTw" id="27bTNFdV6Jb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="27bTNFdV6IV" resolve="list" />
-                        </node>
-                        <node concept="3Tsc0h" id="27bTNFdV6Jc" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:1OShD0HAZ38" resolve="contents" />
-                        </node>
-                      </node>
-                      <node concept="TSZUe" id="27bTNFdV6Jd" role="2OqNvi">
-                        <node concept="2OqwBi" id="27bTNFdV6Je" role="25WWJ7">
-                          <node concept="37vLTw" id="27bTNFdV6Jf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="27bTNFdV6Jh" resolve="c" />
-                          </node>
-                          <node concept="3YRAZt" id="27bTNFdV6Jg" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="27bTNFdV6Jh" role="1bW2Oz">
-                  <property role="TrG5h" value="c" />
-                  <node concept="2jxLKc" id="27bTNFdV6Ji" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="2S6QgY" id="2L$SfAAV6TR">
     <property role="3GE5qa" value="dataform" />
     <property role="TrG5h" value="AddNewLine" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/jetbrains.mps.logic.enumMigration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/jetbrains.mps.logic.enumMigration.mps
deleted file mode 100644
index f5ac5b4c..00000000
--- a/coderules/languages/jetbrains.mps.logic/languageModels/jetbrains.mps.logic.enumMigration.mps
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:1f9ee6eb-3637-4532-b57a-1945ed02e42e(jetbrains.mps.logic.enumMigration)">
-  <persistence version="9" />
-  <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-  </languages>
-  <imports>
-    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <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="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
-        <child id="1163670592366" name="defaultBlock" index="3Kb1Dw" />
-        <child id="1163670766145" name="expression" index="3KbGdf" />
-        <child id="1163670772911" name="case" index="3KbHQx" />
-      </concept>
-      <concept id="1163670641947" name="jetbrains.mps.baseLanguage.structure.SwitchCase" flags="ng" index="3KbdKl">
-        <child id="1163670677455" name="expression" index="3Kbmr1" />
-        <child id="1163670683720" name="body" index="3Kbo56" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="3355805929432017219" name="jetbrains.mps.lang.structure.structure.EnumCustomMethodReplacementInfo" flags="ng" index="2CoXVP">
-        <property id="3355805929432017222" name="kind" index="2CoXVK" />
-        <reference id="3355805929432017224" name="enum" index="2CoXVY" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="4705942098322467729" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="ng" index="21nZrQ">
-        <reference id="4705942098322467736" name="decl" index="21nZrZ" />
-      </concept>
-      <concept id="1966870290088668512" name="jetbrains.mps.lang.smodel.structure.Enum_MemberLiteral" flags="ng" index="2ViDtV">
-        <reference id="1966870290088668516" name="memberDeclaration" index="2ViDtZ" />
-      </concept>
-      <concept id="1240170042401" name="jetbrains.mps.lang.smodel.structure.SEnumerationMemberType" flags="in" index="2ZThk1">
-        <reference id="1240170836027" name="enum" index="2ZWj4r" />
-      </concept>
-      <concept id="2453008993612717253" name="jetbrains.mps.lang.smodel.structure.EnumSwitchCaseBody_Expression" flags="ng" index="3X5gDF">
-        <child id="2453008993612717254" name="expression" index="3X5gDC" />
-      </concept>
-      <concept id="2453008993612559843" name="jetbrains.mps.lang.smodel.structure.EnumSwitchCase" flags="ng" index="3X5Udd">
-        <child id="2453008993612717146" name="body" index="3X5gFO" />
-        <child id="2453008993612559844" name="members" index="3X5Uda" />
-      </concept>
-      <concept id="2453008993612559839" name="jetbrains.mps.lang.smodel.structure.EnumSwitchExpression" flags="ng" index="3X5UdL">
-        <child id="2453008993612714935" name="cases" index="3X5gkp" />
-        <child id="2453008993612559840" name="enumExpression" index="3X5Ude" />
-      </concept>
-      <concept id="5779574625830813396" name="jetbrains.mps.lang.smodel.structure.EnumerationIdRefExpression" flags="ng" index="1XH99k">
-        <reference id="5779574625830813397" name="enumDeclaration" index="1XH99l" />
-      </concept>
-    </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="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="312cEu" id="3czCaDvmnNb">
-    <property role="TrG5h" value="NodeKind_MigrationUtils" />
-    <node concept="3Tm1VV" id="3czCaDvmnNc" role="1B3o_S" />
-    <node concept="2YIFZL" id="3czCaDvmnNu" role="jymVt">
-      <property role="TrG5h" value="value" />
-      <node concept="37vLTG" id="3czCaDvmnNv" role="3clF46">
-        <property role="TrG5h" value="enummember" />
-        <node concept="2ZThk1" id="3czCaDvmnNw" role="1tU5fm">
-          <ref role="2ZWj4r" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3czCaDvmnNx" role="1B3o_S" />
-      <node concept="3clFbS" id="3czCaDvmnNy" role="3clF47">
-        <node concept="3cpWs6" id="3czCaDvmnNz" role="3cqZAp">
-          <node concept="3X5UdL" id="3czCaDvmnN$" role="3cqZAk">
-            <node concept="3X5Udd" id="3czCaDvmnNi" role="3X5gkp">
-              <node concept="21nZrQ" id="3czCaDvmnNj" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:3czCaDvmnN7" resolve="inherit" />
-              </node>
-              <node concept="3X5gDF" id="3czCaDvmnNk" role="3X5gFO">
-                <node concept="10Nm6u" id="3czCaDvmnNe" role="3X5gDC" />
-              </node>
-            </node>
-            <node concept="3X5Udd" id="3czCaDvmnNl" role="3X5gkp">
-              <node concept="21nZrQ" id="3czCaDvmnNm" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:3czCaDvmnN8" resolve="the_default" />
-              </node>
-              <node concept="3X5gDF" id="3czCaDvmnNn" role="3X5gFO">
-                <node concept="Xl_RD" id="3czCaDvmnNf" role="3X5gDC">
-                  <property role="Xl_RC" value="DEFAULT" />
-                </node>
-              </node>
-            </node>
-            <node concept="3X5Udd" id="3czCaDvmnNo" role="3X5gkp">
-              <node concept="21nZrQ" id="3czCaDvmnNp" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:3czCaDvmnN9" resolve="concept_instance" />
-              </node>
-              <node concept="3X5gDF" id="3czCaDvmnNq" role="3X5gFO">
-                <node concept="Xl_RD" id="3czCaDvmnNg" role="3X5gDC">
-                  <property role="Xl_RC" value="CONCEPT_INSTANCE" />
-                </node>
-              </node>
-            </node>
-            <node concept="3X5Udd" id="3czCaDvmnNr" role="3X5gkp">
-              <node concept="21nZrQ" id="3czCaDvmnNs" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:3czCaDvmnNa" resolve="classifier_type" />
-              </node>
-              <node concept="3X5gDF" id="3czCaDvmnNt" role="3X5gFO">
-                <node concept="Xl_RD" id="3czCaDvmnNh" role="3X5gDC">
-                  <property role="Xl_RC" value="CLASSIFIER_TYPE" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="3czCaDvmnN_" role="3X5Ude">
-              <ref role="3cqZAo" node="3czCaDvmnNv" resolve="enummember" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="3czCaDvmnNd" role="3clF45" />
-      <node concept="2CoXVP" id="3czCaDvmnNA" role="lGtFl">
-        <property role="2CoXVK" value="2UidVq6Wu$Q/memberToValue" />
-        <ref role="2CoXVY" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-      </node>
-    </node>
-    <node concept="2YIFZL" id="3czCaDvmnNB" role="jymVt">
-      <property role="TrG5h" value="fromValue" />
-      <node concept="37vLTG" id="3czCaDvmnNC" role="3clF46">
-        <property role="TrG5h" value="value" />
-        <node concept="17QB3L" id="3czCaDvmnND" role="1tU5fm" />
-      </node>
-      <node concept="3Tm1VV" id="3czCaDvmnNE" role="1B3o_S" />
-      <node concept="2ZThk1" id="3czCaDvmnNG" role="3clF45">
-        <ref role="2ZWj4r" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-      </node>
-      <node concept="2CoXVP" id="3czCaDvmnNH" role="lGtFl">
-        <property role="2CoXVK" value="2UidVq6Wu$R/valueToMember" />
-        <ref role="2CoXVY" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-      </node>
-      <node concept="3clFbS" id="3czCaDvmnOc" role="3clF47">
-        <node concept="3clFbJ" id="3czCaDvmnNI" role="3cqZAp">
-          <node concept="3clFbS" id="3czCaDvmnNJ" role="3clFbx">
-            <node concept="3cpWs6" id="3czCaDvmnNK" role="3cqZAp">
-              <node concept="2OqwBi" id="3czCaDvmnNL" role="3cqZAk">
-                <node concept="1XH99k" id="3czCaDvmnNM" role="2Oq$k0">
-                  <ref role="1XH99l" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-                </node>
-                <node concept="2ViDtV" id="3czCaDvmnNN" role="2OqNvi">
-                  <ref role="2ViDtZ" to="5j4j:3czCaDvmnN7" resolve="inherit" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="3czCaDvmnNO" role="3clFbw">
-            <node concept="37vLTw" id="3czCaDvmnNP" role="3uHU7B">
-              <ref role="3cqZAo" node="3czCaDvmnNC" resolve="value" />
-            </node>
-            <node concept="10Nm6u" id="3czCaDvmnNQ" role="3uHU7w" />
-          </node>
-        </node>
-        <node concept="3KaCP$" id="3czCaDvmnOd" role="3cqZAp">
-          <node concept="3KbdKl" id="3czCaDvmnNR" role="3KbHQx">
-            <node concept="3clFbS" id="3czCaDvmnNS" role="3Kbo56">
-              <node concept="3cpWs6" id="3czCaDvmnNT" role="3cqZAp">
-                <node concept="2OqwBi" id="3czCaDvmnNU" role="3cqZAk">
-                  <node concept="1XH99k" id="3czCaDvmnNV" role="2Oq$k0">
-                    <ref role="1XH99l" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-                  </node>
-                  <node concept="2ViDtV" id="3czCaDvmnNW" role="2OqNvi">
-                    <ref role="2ViDtZ" to="5j4j:3czCaDvmnN8" resolve="the_default" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="Xl_RD" id="3czCaDvmnNX" role="3Kbmr1">
-              <property role="Xl_RC" value="DEFAULT" />
-            </node>
-          </node>
-          <node concept="3KbdKl" id="3czCaDvmnNY" role="3KbHQx">
-            <node concept="3clFbS" id="3czCaDvmnNZ" role="3Kbo56">
-              <node concept="3cpWs6" id="3czCaDvmnO0" role="3cqZAp">
-                <node concept="2OqwBi" id="3czCaDvmnO1" role="3cqZAk">
-                  <node concept="1XH99k" id="3czCaDvmnO2" role="2Oq$k0">
-                    <ref role="1XH99l" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-                  </node>
-                  <node concept="2ViDtV" id="3czCaDvmnO3" role="2OqNvi">
-                    <ref role="2ViDtZ" to="5j4j:3czCaDvmnN9" resolve="concept_instance" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="Xl_RD" id="3czCaDvmnO4" role="3Kbmr1">
-              <property role="Xl_RC" value="CONCEPT_INSTANCE" />
-            </node>
-          </node>
-          <node concept="3KbdKl" id="3czCaDvmnO5" role="3KbHQx">
-            <node concept="3clFbS" id="3czCaDvmnO6" role="3Kbo56">
-              <node concept="3cpWs6" id="3czCaDvmnO7" role="3cqZAp">
-                <node concept="2OqwBi" id="3czCaDvmnO8" role="3cqZAk">
-                  <node concept="1XH99k" id="3czCaDvmnO9" role="2Oq$k0">
-                    <ref role="1XH99l" to="5j4j:3czCaDvmnN5" resolve="NodeKind" />
-                  </node>
-                  <node concept="2ViDtV" id="3czCaDvmnOa" role="2OqNvi">
-                    <ref role="2ViDtZ" to="5j4j:3czCaDvmnNa" resolve="classifier_type" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="Xl_RD" id="3czCaDvmnOb" role="3Kbmr1">
-              <property role="Xl_RC" value="CLASSIFIER_TYPE" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="3czCaDvmnOe" role="3KbGdf">
-            <ref role="3cqZAo" node="3czCaDvmnNC" resolve="value" />
-          </node>
-          <node concept="3clFbS" id="3czCaDvmnOf" role="3Kb1Dw">
-            <node concept="3cpWs6" id="3czCaDvmnOg" role="3cqZAp">
-              <node concept="10Nm6u" id="3czCaDvmnOh" role="3cqZAk" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index fdde05d3..99329dae 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -12,16 +12,6 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
-        <property id="1421157252384165432" name="memberId" index="3tVfz5" />
-        <property id="672037151186491528" name="presentation" index="1L1pqM" />
-        <reference id="899069222106091871" name="oldMember" index="2wpffI" />
-      </concept>
-      <concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclaration" flags="ng" index="25R3W">
-        <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
-        <child id="3348158742936976577" name="members" index="25R1y" />
-      </concept>
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="7862711839422615209" name="jetbrains.mps.lang.structure.structure.DocumentedNodeAnnotation" flags="ng" index="t5JxF">
         <property id="7862711839422615217" name="text" index="t5JxN" />
         <child id="7862711839422615224" name="seeAlso" index="t5JxU" />
@@ -35,22 +25,6 @@
       <concept id="6054523464627964745" name="jetbrains.mps.lang.structure.structure.AttributeInfo_AttributedConcept" flags="ng" index="trNpa">
         <reference id="6054523464627965081" name="concept" index="trN6q" />
       </concept>
-      <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
-        <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
-      </concept>
-      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration_Old" flags="ng" index="AxPO7">
-        <reference id="1083171729157" name="memberDataType" index="M4eZT" />
-        <child id="1083172003582" name="member" index="M5hS2" />
-      </concept>
-      <concept id="1588368162884797030" name="jetbrains.mps.lang.structure.structure.EnumMigrationInfo" flags="ng" index="2JgGob">
-        <property id="6491077959634662372" name="valueOpMigration" index="3scbB" />
-        <property id="6491077959634650670" name="nameOpMigration" index="3sfsH" />
-        <child id="6491077959632451996" name="oldEnum" index="3lCyv" />
-      </concept>
-      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration_Old" flags="ig" index="M4N5e">
-        <property id="1083923523172" name="externalValue" index="1uS6qo" />
-        <property id="1083923523171" name="internalValue" index="1uS6qv" />
-      </concept>
       <concept id="2992811758677295509" name="jetbrains.mps.lang.structure.structure.AttributeInfo" flags="ng" index="M6xJ_">
         <property id="7588428831955550663" name="role" index="Hh88m" />
         <child id="7588428831947959310" name="attributed" index="EQaZv" />
@@ -238,20 +212,6 @@
       <property role="t5JxN" value="An abstraction of any construct acceptable in a logical context." />
     </node>
   </node>
-  <node concept="1TIwiD" id="7E86$tKt5sV">
-    <property role="3GE5qa" value="logical.item" />
-    <property role="TrG5h" value="ExpressionLogicalVariable" />
-    <property role="EcuMT" value="8829335963591530299" />
-    <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
-    <node concept="1TJgyj" id="7E86$tKt5BI" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <property role="IQ2ns" value="8829335963591530990" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="asaX9" id="5HLeEcf271O" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="7E86$tKtfM3">
     <property role="3GE5qa" value="logical.variable" />
     <property role="TrG5h" value="LogicalVariableDeclaration" />
@@ -376,35 +336,6 @@
       <property role="t5JxN" value="!!FIXME rename to LogicalArrayType!!" />
     </node>
   </node>
-  <node concept="1TIwiD" id="5NAQwIkRIXT">
-    <property role="EcuMT" value="6694277639409954681" />
-    <property role="3GE5qa" value="dataform.role" />
-    <property role="TrG5h" value="ListRole" />
-    <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="RoleNode" />
-    <node concept="1TJgyj" id="5NAQwIkRIYU" role="1TKVEi">
-      <property role="IQ2ns" value="6694277639409954746" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="list" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="1OShD0HAY6y" resolve="ListNode" />
-    </node>
-    <node concept="asaX9" id="2L$SfABkf0J" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="428_4iYhwbR">
-    <property role="EcuMT" value="4650129638230983415" />
-    <property role="TrG5h" value="ListExpression" />
-    <property role="34LRSv" value="list" />
-    <property role="3GE5qa" value="dataform.expression" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="1TJgyj" id="5WBVN_MJ9$7" role="1TKVEi">
-      <property role="IQ2ns" value="6856711987712006407" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="literal" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="5WBVN_MJ50y" resolve="ListLiteral" />
-    </node>
-    <node concept="asaX9" id="27bTNFdTRnM" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="5WBVN_MESCN">
     <property role="EcuMT" value="6856711987710888499" />
     <property role="3GE5qa" value="logical.item" />
@@ -423,36 +354,6 @@
       <property role="t5JxN" value="Allows to use data form in a logical context." />
     </node>
   </node>
-  <node concept="1TIwiD" id="5WBVN_MJ50y">
-    <property role="EcuMT" value="6856711987711987746" />
-    <property role="TrG5h" value="ListLiteral" />
-    <property role="34LRSv" value="list" />
-    <property role="3GE5qa" value="logical.item" />
-    <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
-    <node concept="1TJgyj" id="5WBVN_MJ50Y" role="1TKVEi">
-      <property role="IQ2ns" value="6856711987711987774" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
-    </node>
-    <node concept="asaX9" id="27bTNFeNrZK" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="28ktUhrjnwn">
-    <property role="EcuMT" value="2455719244613908503" />
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="ValueOfExpression" />
-    <property role="34LRSv" value="valueOf" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="1TJgyj" id="28ktUhrjrp0" role="1TKVEi">
-      <property role="IQ2ns" value="2455719244613924416" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="logical" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="asaX9" id="7zIaasjAAuv" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="49obaclcan7">
     <property role="EcuMT" value="4780620083400582599" />
     <property role="TrG5h" value="LogicalItemExpression" />
@@ -688,61 +589,6 @@
       <node concept="tn0Fv" id="2L$SfAAV6TP" role="HhnKV" />
     </node>
   </node>
-  <node concept="25R3W" id="3czCaDvmnN5">
-    <property role="TrG5h" value="NodeKind" />
-    <property role="3GE5qa" value="dataform" />
-    <property role="3F6X1D" value="7166797808989207678" />
-    <ref role="1H5jkz" node="3czCaDvmnN7" resolve="inherit" />
-    <node concept="2JgGob" id="3czCaDvmnN6" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3fo/by_custom_methods" />
-      <property role="3sfsH" value="5CkWgdpp0p2/by_presentation" />
-      <node concept="AxPO7" id="6dP_abdQnLY" role="3lCyv">
-        <property role="TrG5h" value="NodeKind" />
-        <property role="3GE5qa" value="dataform" />
-        <property role="3F6X1D" value="7166797808989207678" />
-        <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
-        <node concept="M4N5e" id="1dOf$WH0KX6" role="M5hS2">
-          <property role="1uS6qo" value="inherit" />
-        </node>
-        <node concept="M4N5e" id="45hxFudjYuy" role="M5hS2">
-          <property role="1uS6qo" value="the default" />
-          <property role="1uS6qv" value="DEFAULT" />
-        </node>
-        <node concept="M4N5e" id="6dP_abdTU2g" role="M5hS2">
-          <property role="1uS6qv" value="CONCEPT_INSTANCE" />
-          <property role="1uS6qo" value="concept instance" />
-        </node>
-        <node concept="M4N5e" id="6dP_abdQo2a" role="M5hS2">
-          <property role="1uS6qv" value="CLASSIFIER_TYPE" />
-          <property role="1uS6qo" value="classifier type" />
-        </node>
-      </node>
-    </node>
-    <node concept="25R33" id="3czCaDvmnN7" role="25R1y">
-      <property role="TrG5h" value="inherit" />
-      <property role="3tVfz5" value="1401813893797580614" />
-      <ref role="2wpffI" node="1dOf$WH0KX6" />
-    </node>
-    <node concept="25R33" id="3czCaDvmnN8" role="25R1y">
-      <property role="TrG5h" value="the_default" />
-      <property role="1L1pqM" value="the default" />
-      <property role="3tVfz5" value="4706691208486840226" />
-      <ref role="2wpffI" node="45hxFudjYuy" />
-    </node>
-    <node concept="25R33" id="3czCaDvmnN9" role="25R1y">
-      <property role="TrG5h" value="concept_instance" />
-      <property role="1L1pqM" value="concept instance" />
-      <property role="3tVfz5" value="7166797808990134416" />
-      <ref role="2wpffI" node="6dP_abdTU2g" />
-    </node>
-    <node concept="25R33" id="3czCaDvmnNa" role="25R1y">
-      <property role="TrG5h" value="classifier_type" />
-      <property role="1L1pqM" value="classifier type" />
-      <property role="3tVfz5" value="7166797808989208714" />
-      <ref role="2wpffI" node="6dP_abdQo2a" />
-    </node>
-    <node concept="asaX9" id="3MfP0fwgdLs" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="PltxfHNb9C">
     <property role="EcuMT" value="960803923479540328" />
     <property role="3GE5qa" value="dataform" />
@@ -764,22 +610,6 @@
       <property role="t5JxN" value="!!FIXME rename to LogicalVariableDataForm!! Allows to use a logical variable that represents a data form." />
     </node>
   </node>
-  <node concept="1TIwiD" id="PltxfHULAb">
-    <property role="EcuMT" value="960803923481532811" />
-    <property role="3GE5qa" value="dataform" />
-    <property role="TrG5h" value="ListNodeCons" />
-    <property role="34LRSv" value="cons list" />
-    <property role="R4oN_" value="cons list node" />
-    <ref role="1TJDcQ" node="1OShD0HAY6y" resolve="ListNode" />
-    <node concept="1TJgyj" id="PltxfHVVwQ" role="1TKVEi">
-      <property role="IQ2ns" value="960803923481835574" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="tail" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
-    </node>
-    <node concept="asaX9" id="1fvYCPAmuWa" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="24ciDNzqIuw">
     <property role="EcuMT" value="2381360340662937504" />
     <property role="3GE5qa" value="term" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index e5eb0086..ca6b73ef 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -398,42 +398,6 @@
             <node concept="3clFbH" id="6YPNC4OxGRk" role="3cqZAp" />
           </node>
         </node>
-        <node concept="3eNFk2" id="428_4iY4YrU" role="3eNLev">
-          <node concept="3clFbS" id="428_4iY4YrW" role="3eOfB_">
-            <node concept="1Z5TYs" id="428_4iY4YLn" role="3cqZAp">
-              <node concept="mw_s8" id="428_4iY4YLo" role="1ZfhKB">
-                <node concept="2c44tf" id="428_4iY4YLp" role="mwGJk">
-                  <node concept="3uibUv" id="428_4iY4YLq" role="2c44tc">
-                    <ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
-                  </node>
-                </node>
-              </node>
-              <node concept="mw_s8" id="428_4iY4YLr" role="1ZfhK$">
-                <node concept="1Z2H0r" id="428_4iY4YLs" role="mwGJk">
-                  <node concept="1YBJjd" id="428_4iY4YLt" role="1Z2MuG">
-                    <ref role="1YBMHb" node="1pt0VTMFg5X" resolve="tfe" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="428_4iY4YMs" role="3cqZAp" />
-          </node>
-          <node concept="2OqwBi" id="428_4iY4Yzs" role="3eO9$A">
-            <node concept="2OqwBi" id="428_4iY4Yzt" role="2Oq$k0">
-              <node concept="1YBJjd" id="428_4iY4Yzu" role="2Oq$k0">
-                <ref role="1YBMHb" node="1pt0VTMFg5X" resolve="tfe" />
-              </node>
-              <node concept="3TrEf2" id="428_4iY4Yzv" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
-              </node>
-            </node>
-            <node concept="1mIQ4w" id="428_4iY4Yzw" role="2OqNvi">
-              <node concept="chp4Y" id="428_4iY4YEz" role="cj9EA">
-                <ref role="cht4Q" to="5j4j:5NAQwIkRIXT" resolve="ListRole" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3eNFk2" id="6YPNC4OxGRv" role="3eNLev">
           <node concept="2OqwBi" id="6YPNC4OxHZZ" role="3eO9$A">
             <node concept="2OqwBi" id="6YPNC4OxHgy" role="2Oq$k0">
@@ -1127,143 +1091,6 @@
       <ref role="1YaFvo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     </node>
   </node>
-  <node concept="1YbPZF" id="428_4iYhAjN">
-    <property role="TrG5h" value="typeof_ListExpression" />
-    <property role="3GE5qa" value="dataform.expression" />
-    <node concept="3clFbS" id="428_4iYhAjO" role="18ibNy">
-      <node concept="1Z5TYs" id="428_4iYhACh" role="3cqZAp">
-        <node concept="mw_s8" id="428_4iYhAC_" role="1ZfhKB">
-          <node concept="2c44tf" id="428_4iYhACx" role="mwGJk">
-            <node concept="3uibUv" id="428_4iYhADp" role="2c44tc">
-              <ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="428_4iYhACk" role="1ZfhK$">
-          <node concept="1Z2H0r" id="428_4iYhArk" role="mwGJk">
-            <node concept="1YBJjd" id="428_4iYhAr$" role="1Z2MuG">
-              <ref role="1YBMHb" node="428_4iYhAjQ" resolve="le" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="428_4iYhAjQ" role="1YuTPh">
-      <property role="TrG5h" value="le" />
-      <ref role="1YaFvo" to="5j4j:428_4iYhwbR" resolve="ListExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="28ktUhrEYS_">
-    <property role="TrG5h" value="typeof_ValueOfLogicalExpression" />
-    <property role="3GE5qa" value="logical" />
-    <node concept="3clFbS" id="28ktUhrEYSA" role="18ibNy">
-      <node concept="1ZxtTE" id="28ktUhrF1XH" role="3cqZAp">
-        <property role="TrG5h" value="DT" />
-      </node>
-      <node concept="nvevp" id="7lt0LtPZ8m6" role="3cqZAp">
-        <node concept="3clFbS" id="7lt0LtPZ8m8" role="nvhr_">
-          <node concept="1Z5TYs" id="28ktUhrF1PA" role="3cqZAp">
-            <node concept="mw_s8" id="28ktUhrF1PB" role="1ZfhK$">
-              <node concept="1Z2H0r" id="28ktUhrF1PC" role="mwGJk">
-                <node concept="2OqwBi" id="28ktUhrF2IB" role="1Z2MuG">
-                  <node concept="1YBJjd" id="28ktUhrF2u0" role="2Oq$k0">
-                    <ref role="1YBMHb" node="28ktUhrEYSC" resolve="vle" />
-                  </node>
-                  <node concept="3TrEf2" id="28ktUhrF33X" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:28ktUhrjrp0" resolve="logical" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="mw_s8" id="28ktUhrF1PG" role="1ZfhKB">
-              <node concept="2pJPEk" id="28ktUhrF1PH" role="mwGJk">
-                <node concept="2pJPED" id="28ktUhrF1PI" role="2pJPEn">
-                  <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
-                  <node concept="2pIpSj" id="28ktUhrF1PJ" role="2pJxcM">
-                    <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                    <node concept="36biLy" id="28ktUhrF1PK" role="28nt2d">
-                      <node concept="1PxgMI" id="28ktUhrF1PL" role="36biLW">
-                        <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="28ktUhrF1PM" role="3oSUPX">
-                          <ref role="cht4Q" to="tpee:fz3vP1H" resolve="Type" />
-                        </node>
-                        <node concept="1Z$b5t" id="28ktUhrF1Yg" role="1m5AlR">
-                          <ref role="1Z$eMM" node="28ktUhrF1XH" resolve="DT" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="7lt0LtPZ5ss" role="3cqZAp">
-            <node concept="3clFbS" id="7lt0LtPZ5su" role="3clFbx">
-              <node concept="1Z5TYs" id="28ktUhrF1zx" role="3cqZAp">
-                <node concept="mw_s8" id="28ktUhrF1zy" role="1ZfhK$">
-                  <node concept="1Z2H0r" id="28ktUhrF1zz" role="mwGJk">
-                    <node concept="1YBJjd" id="28ktUhrF2ws" role="1Z2MuG">
-                      <ref role="1YBMHb" node="28ktUhrEYSC" resolve="vle" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="mw_s8" id="28ktUhrF21A" role="1ZfhKB">
-                  <node concept="1Z$b5t" id="28ktUhrF21w" role="mwGJk">
-                    <ref role="1Z$eMM" node="28ktUhrF1XH" resolve="DT" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="7lt0LtPZ5QN" role="3cqZAp" />
-            </node>
-            <node concept="2OqwBi" id="7lt0LtPZ5$Q" role="3clFbw">
-              <node concept="1Z$b5t" id="7lt0LtPZ5t3" role="2Oq$k0">
-                <ref role="1Z$eMM" node="28ktUhrF1XH" resolve="DT" />
-              </node>
-              <node concept="3x8VRR" id="7lt0LtPZ5Jn" role="2OqNvi" />
-            </node>
-            <node concept="9aQIb" id="7lt0LtPZ5QX" role="9aQIa">
-              <node concept="3clFbS" id="7lt0LtPZ5QY" role="9aQI4">
-                <node concept="1Z5TYs" id="7lt0LtPZ63j" role="3cqZAp">
-                  <node concept="mw_s8" id="7lt0LtPZ64j" role="1ZfhKB">
-                    <node concept="2c44tf" id="7lt0LtPZ64f" role="mwGJk">
-                      <node concept="3uibUv" id="7lt0LtPZ657" role="2c44tc">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="mw_s8" id="7lt0LtPZ63m" role="1ZfhK$">
-                    <node concept="1Z2H0r" id="7lt0LtPZ5Tr" role="mwGJk">
-                      <node concept="1YBJjd" id="7lt0LtPZ5Vb" role="1Z2MuG">
-                        <ref role="1YBMHb" node="28ktUhrEYSC" resolve="vle" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Z2H0r" id="7lt0LtPZ8of" role="nvjzm">
-          <node concept="2OqwBi" id="7lt0LtPZ8wP" role="1Z2MuG">
-            <node concept="1YBJjd" id="7lt0LtPZ8oF" role="2Oq$k0">
-              <ref role="1YBMHb" node="28ktUhrEYSC" resolve="vle" />
-            </node>
-            <node concept="3TrEf2" id="7lt0LtPZ8MJ" role="2OqNvi">
-              <ref role="3Tt5mk" to="5j4j:28ktUhrjrp0" resolve="logical" />
-            </node>
-          </node>
-        </node>
-        <node concept="2X1qdy" id="7lt0LtPZ8mc" role="2X0Ygz">
-          <property role="TrG5h" value="T" />
-          <node concept="2jxLKc" id="7lt0LtPZ8md" role="1tU5fm" />
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="28ktUhrEYSC" role="1YuTPh">
-      <property role="TrG5h" value="vle" />
-      <ref role="1YaFvo" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="49obaclcIlr">
     <property role="TrG5h" value="typeof_LogicalExpression" />
     <property role="3GE5qa" value="logical.item.expression" />