diff --git a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
index 0f243728..f6f2fb0f 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -33,9 +33,7 @@
       <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
-      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi">
-        <child id="1078153129734" name="inspectedCellModel" index="6VMZX" />
-      </concept>
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
       <concept id="1176897764478" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeFactory" flags="in" index="4$FPG" />
       <concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
       <concept id="6516520003787916624" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Condition" flags="ig" index="27VH4U" />
@@ -111,7 +109,6 @@
       </concept>
       <concept id="8449131619432941427" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Super" flags="ng" index="L$LW2" />
       <concept id="1216308599511" name="jetbrains.mps.lang.editor.structure.PositionStyleClassItem" flags="ln" index="LD5Jc" />
-      <concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
@@ -399,9 +396,6 @@
         <reference id="5253134957341833005" name="conceptDeclaration" index="prhl4" />
         <reference id="5253134957341833006" name="linkDeclaration" index="prhl7" />
       </concept>
-      <concept id="1138676077309" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="nn" index="uoxfO">
-        <reference id="1138676095763" name="enumMember" index="uo_Cq" />
-      </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
       <concept id="1143235216708" name="jetbrains.mps.lang.smodel.structure.Model_CreateNewNodeOperation" flags="nn" index="I8ghe">
@@ -414,9 +408,6 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <concept id="1146171026731" name="jetbrains.mps.lang.smodel.structure.Property_HasValue_Enum" flags="nn" index="3t7uKx">
-        <child id="1146171026732" name="value" index="3t7uKA" />
-      </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
@@ -428,9 +419,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="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -762,47 +750,9 @@
       </node>
     </node>
   </node>
-  <node concept="PKFIW" id="6dP_abdQqhT">
-    <property role="TrG5h" value="Node_Inspector" />
-    <property role="3GE5qa" value="treeform" />
-    <ref role="1XX52x" to="5j4j:6$jH9oLmYC_" resolve="TermNode" />
-    <node concept="3EZMnI" id="6dP_abdQqoF" role="2wV5jI">
-      <node concept="3F0ifn" id="6dP_abdR3F1" role="3EZMnx">
-        <property role="3F0ifm" value="show as:" />
-      </node>
-      <node concept="3F0A7n" id="6dP_abdQqAn" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:6dP_abdQoiG" resolve="kind" />
-      </node>
-      <node concept="l2Vlx" id="6dP_abdQqoI" role="2iSdaV" />
-      <node concept="pkWqt" id="kTK1BfuSJd" role="pqm2j">
-        <node concept="3clFbS" id="kTK1BfuSJe" role="2VODD2">
-          <node concept="3clFbF" id="kTK1BfuSQr" role="3cqZAp">
-            <node concept="3fqX7Q" id="kTK1BfuVac" role="3clFbG">
-              <node concept="2OqwBi" id="kTK1BfuVae" role="3fr31v">
-                <node concept="2OqwBi" id="kTK1BfuVaf" role="2Oq$k0">
-                  <node concept="pncrf" id="kTK1BfuVag" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="kTK1BfuVah" role="2OqNvi">
-                    <ref role="3TsBF5" to="5j4j:6dP_abdQoiG" resolve="kind" />
-                  </node>
-                </node>
-                <node concept="3t7uKx" id="kTK1BfuVai" role="2OqNvi">
-                  <node concept="uoxfO" id="kTK1BfuVaj" role="3t7uKA">
-                    <ref role="uo_Cq" to="5j4j:1dOf$WH0KX6" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="6dP_abdQWZZ">
     <property role="3GE5qa" value="treeform" />
     <ref role="1XX52x" to="5j4j:6$jH9oLmYC_" resolve="TermNode" />
-    <node concept="PMmxH" id="6dP_abdQXdF" role="6VMZX">
-      <ref role="PMmxG" node="6dP_abdQqhT" resolve="Node_Inspector" />
-    </node>
     <node concept="3EZMnI" id="kTK1BfuVyd" role="2wV5jI">
       <node concept="3F0ifn" id="kTK1BfuVye" role="3EZMnx">
         <property role="3F0ifm" value="(" />
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
index 64d8b269..c709ce52 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -10,7 +10,6 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
       </concept>
@@ -86,12 +85,6 @@
     <property role="3GE5qa" value="treeform" />
     <property role="EcuMT" value="7571593955706137125" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="TreeForm" />
-    <node concept="1TJgyi" id="6dP_abdQoiG" role="1TKVEl">
-      <property role="TrG5h" value="kind" />
-      <property role="IQ2nx" value="7166797808989209772" />
-      <ref role="AX2Wp" node="6dP_abdQnLY" resolve="NodeKind" />
-      <node concept="asaX9" id="kTK1BfuS5K" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="6$jH9oLnyAp" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="role" />
@@ -224,12 +217,6 @@
       <property role="20kJfa" value="cardinalityExpr" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
-    <node concept="1TJgyi" id="7E86$tKtijQ" role="1TKVEl">
-      <property role="TrG5h" value="isMulti" />
-      <property role="IQ2nx" value="8829335963591582966" />
-      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-      <node concept="asaX9" id="7dgRGU4AfJD" role="lGtFl" />
-    </node>
     <node concept="PrWs8" id="7E86$tKtid6" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index e0cc5d82..c892643e 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -180,9 +180,6 @@
       <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
         <child id="1171903916107" name="bound" index="3qUE_r" />
       </concept>
-      <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
-        <property id="8355037393041754995" name="isNative" index="2aFKle" />
-      </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
@@ -231,22 +228,7 @@
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
     </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </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>
@@ -1016,191 +998,8 @@
       <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
     </node>
   </node>
-  <node concept="312cEu" id="4TCblo5ZkfI">
-    <property role="TrG5h" value="AbstractAndItem" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="4TCblo5ZkCv" role="jymVt" />
-    <node concept="3clFb_" id="4TCblo5M6dy" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="instanceArguments" />
-      <node concept="37vLTG" id="4TCblo5Nrp7" role="3clF46">
-        <property role="TrG5h" value="logicalContext" />
-        <node concept="3uibUv" id="4TCblo5Nrr2" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="4TCblo5ZoJF" role="1B3o_S" />
-      <node concept="3uibUv" id="7rf49NglUPS" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3qTvmN" id="7rf49NglVgj" role="11_B2D" />
-      </node>
-      <node concept="3clFbS" id="4TCblo5M6dC" role="3clF47">
-        <node concept="3cpWs8" id="4TCblo5Nofp" role="3cqZAp">
-          <node concept="3cpWsn" id="4TCblo5Nofq" role="3cpWs9">
-            <property role="TrG5h" value="res" />
-            <node concept="3uibUv" id="4TCblo5Noff" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
-              <node concept="3uibUv" id="4TCblo5Nofi" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="4TCblo5Nofr" role="33vP2m">
-              <node concept="1pGfFk" id="4TCblo5Nofs" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
-                <node concept="2OqwBi" id="4TCblo5Noft" role="37wK5m">
-                  <node concept="1rXfSq" id="4TCblo5ZmDR" role="2Oq$k0">
-                    <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
-                  </node>
-                  <node concept="liA8E" id="4TCblo5Zn2F" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="4TCblo5Nofw" role="1pMfVU">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="4TCblo5NoSa" role="3cqZAp">
-          <node concept="3clFbS" id="4TCblo5NoSc" role="2LFqv$">
-            <node concept="3clFbJ" id="4TCblo5Npl3" role="3cqZAp">
-              <node concept="3eNFk2" id="4TCblo5Z7hN" role="3eNLev">
-                <node concept="2ZW3vV" id="4TCblo5Z7_w" role="3eO9$A">
-                  <node concept="3uibUv" id="4TCblo5Z7CL" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                  </node>
-                  <node concept="37vLTw" id="4TCblo5Z7xU" role="2ZW6bz">
-                    <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="4TCblo5Z7hP" role="3eOfB_">
-                  <node concept="3clFbF" id="4TCblo5Z7IR" role="3cqZAp">
-                    <node concept="2OqwBi" id="4TCblo5Z7IS" role="3clFbG">
-                      <node concept="37vLTw" id="4TCblo5Z7IT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4TCblo5Nofq" resolve="res" />
-                      </node>
-                      <node concept="liA8E" id="4TCblo5Z7IU" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                        <node concept="2OqwBi" id="4TCblo5Z8fU" role="37wK5m">
-                          <node concept="37vLTw" id="4TCblo5Z86K" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4TCblo5Nrp7" resolve="logicalContext" />
-                          </node>
-                          <node concept="liA8E" id="4TCblo5Z8s6" role="2OqNvi">
-                            <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
-                            <node concept="10QFUN" id="4TCblo5Z8y1" role="37wK5m">
-                              <node concept="37vLTw" id="4TCblo5Z97c" role="10QFUP">
-                                <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
-                              </node>
-                              <node concept="3uibUv" id="4TCblo5Z8NB" role="10QFUM">
-                                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                                <node concept="3uibUv" id="4TCblo5Z9P0" role="11_B2D">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4TCblo5Z7FY" role="3cqZAp" />
-                </node>
-              </node>
-              <node concept="3clFbS" id="4TCblo5Npl5" role="3clFbx">
-                <node concept="3clFbF" id="4TCblo5NpB6" role="3cqZAp">
-                  <node concept="2OqwBi" id="4TCblo5NpQT" role="3clFbG">
-                    <node concept="37vLTw" id="4TCblo5NpB4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4TCblo5Nofq" resolve="res" />
-                    </node>
-                    <node concept="liA8E" id="4TCblo5NqAb" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                      <node concept="2YIFZM" id="4TCblo5Nr7d" role="37wK5m">
-                        <ref role="37wK5l" node="4TCblo5NqWF" resolve="instantiateMetaLogicals" />
-                        <ref role="1Pybhc" node="677NV565N1x" resolve="LogicalUtil" />
-                        <node concept="10QFUN" id="4TCblo5Nskr" role="37wK5m">
-                          <node concept="3uibUv" id="4TCblo5Nskp" role="10QFUM">
-                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                          </node>
-                          <node concept="37vLTw" id="4TCblo5NsuL" role="10QFUP">
-                            <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="4TCblo5NsHZ" role="37wK5m">
-                          <ref role="3cqZAo" node="4TCblo5Nrp7" resolve="logicalContext" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="4TCblo5Yuzk" role="3cqZAp" />
-              </node>
-              <node concept="2ZW3vV" id="4TCblo5NptX" role="3clFbw">
-                <node concept="3uibUv" id="4TCblo5NpxS" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                </node>
-                <node concept="37vLTw" id="4TCblo5Nppi" role="2ZW6bz">
-                  <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
-                </node>
-              </node>
-              <node concept="9aQIb" id="4TCblo5NsUE" role="9aQIa">
-                <node concept="3clFbS" id="4TCblo5NsUF" role="9aQI4">
-                  <node concept="3clFbF" id="4TCblo5Nt4I" role="3cqZAp">
-                    <node concept="2OqwBi" id="4TCblo5Ntkx" role="3clFbG">
-                      <node concept="37vLTw" id="4TCblo5Nt4H" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4TCblo5Nofq" resolve="res" />
-                      </node>
-                      <node concept="liA8E" id="4TCblo5Nu3N" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
-                        <node concept="37vLTw" id="4TCblo5Nuf1" role="37wK5m">
-                          <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="4TCblo5NoSd" role="1Duv9x">
-            <property role="TrG5h" value="a" />
-            <node concept="3uibUv" id="4TCblo5NoWE" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-          <node concept="1rXfSq" id="4TCblo5Znfk" role="1DdaDG">
-            <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="4TCblo5NpdK" role="3cqZAp">
-          <node concept="37vLTw" id="4TCblo5NpdI" role="3clFbG">
-            <ref role="3cqZAo" node="4TCblo5Nofq" resolve="res" />
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="5WBVN_M0Tbf" role="lGtFl">
-        <node concept="TZ5HA" id="5WBVN_M0U54" role="TZ5H$">
-          <node concept="1dT_AC" id="5WBVN_M0U9o" role="1dT_Ay">
-            <property role="1dT_AB" value="FIXME: not used, delete me" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5WBVN_M0Tbi" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4sSe4$oZQjr" role="jymVt" />
-    <node concept="3Tm1VV" id="4TCblo5ZkfJ" role="1B3o_S" />
-    <node concept="3uibUv" id="4TCblo5Zkgx" role="EKbjA">
-      <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
-    </node>
-  </node>
   <node concept="312cEu" id="5uFPQ7BZsAX">
     <property role="TrG5h" value="AbstractConstraint" />
-    <node concept="3uibUv" id="4TCblo5ZtPg" role="1zkMxy">
-      <ref role="3uigEE" node="4TCblo5ZkfI" resolve="AbstractAndItem" />
-    </node>
     <node concept="2tJIrI" id="5uFPQ7BZsC9" role="jymVt" />
     <node concept="3clFbW" id="5uFPQ7BZtsU" role="jymVt">
       <node concept="37vLTG" id="5uFPQ7BZtxe" role="3clF46">
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
index d491580c..8c776da1 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
@@ -267,7 +267,7 @@
         <node concept="3clFbF" id="6Kcfpq7B99k" role="3cqZAp">
           <node concept="2OqwBi" id="5uFPQ7BZfDt" role="3clFbG">
             <node concept="1rXfSq" id="7ISVfSJnHs" role="2Oq$k0">
-              <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+              <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
             </node>
             <node concept="liA8E" id="5uFPQ7BZfHQ" role="2OqNvi">
               <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
@@ -368,7 +368,7 @@
                       <ref role="3cqZAo" node="6Kcfpq7B2Ww" resolve="that" />
                     </node>
                     <node concept="liA8E" id="7ISVfSJor9" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -378,7 +378,7 @@
                       <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                     </node>
                     <node concept="1rXfSq" id="7ISVfSJomP" role="10QFUP">
-                      <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -387,7 +387,7 @@
             <node concept="3y3z36" id="6Kcfpq7B2WV" role="3K4Cdx">
               <node concept="10Nm6u" id="6Kcfpq7B2WW" role="3uHU7w" />
               <node concept="1rXfSq" id="7ISVfSJojN" role="3uHU7B">
-                <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+                <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
               </node>
             </node>
             <node concept="3y3z36" id="6Kcfpq7B2WX" role="3K4GZi">
@@ -397,7 +397,7 @@
                   <ref role="3cqZAo" node="6Kcfpq7B2Ww" resolve="that" />
                 </node>
                 <node concept="liA8E" id="7ISVfSJots" role="2OqNvi">
-                  <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+                  <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -457,7 +457,7 @@
                   <node concept="3y3z36" id="6Kcfpq7B2Xt" role="3K4Cdx">
                     <node concept="10Nm6u" id="6Kcfpq7B2Xu" role="3uHU7w" />
                     <node concept="1rXfSq" id="7ISVfSJoxI" role="3uHU7B">
-                      <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="6Kcfpq7B2Xv" role="3K4E3e">
@@ -465,7 +465,7 @@
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                       <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
                       <node concept="1rXfSq" id="7ISVfSJoy$" role="37wK5m">
-                        <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6Kcfpq7B2Xx" role="2OqNvi">
@@ -500,9 +500,6 @@
         </node>
       </node>
     </node>
-    <node concept="3uibUv" id="4TCblo5ZwCk" role="1zkMxy">
-      <ref role="3uigEE" to="yg8f:4TCblo5ZkfI" resolve="AbstractAndItem" />
-    </node>
   </node>
   <node concept="312cEu" id="2GO7tyJVmP4">
     <property role="TrG5h" value="UnificationPredicate" />
@@ -1015,21 +1012,6 @@
   <node concept="312cEu" id="3F6vMxqo13Y">
     <property role="TrG5h" value="DefaultSessionSolver" />
     <node concept="2tJIrI" id="3F6vMxqo1bG" role="jymVt" />
-    <node concept="3clFbW" id="3F6vMxqo1c$" role="jymVt">
-      <node concept="37vLTG" id="3F6vMxqo1cY" role="3clF46">
-        <property role="TrG5h" value="javaExpressionSolver" />
-        <node concept="3uibUv" id="5jCHAT2qKEp" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3F6vMxqo1cA" role="3clF45" />
-      <node concept="3Tm1VV" id="3F6vMxqo1cB" role="1B3o_S" />
-      <node concept="3clFbS" id="3F6vMxqo1cC" role="3clF47" />
-      <node concept="2AHcQZ" id="23c4kVtauK5" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="23c4kVtauXp" role="jymVt" />
     <node concept="3clFbW" id="23c4kVtavpK" role="jymVt">
       <node concept="3cqZAl" id="23c4kVtavpM" role="3clF45" />
       <node concept="3Tm1VV" id="23c4kVtavpN" role="1B3o_S" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
index d247ff6f..d8728fde 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -4338,48 +4338,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="Hg6Enc6sLX" role="jymVt" />
-    <node concept="3clFb_" id="7y50OW6WPl4" role="jymVt">
-      <property role="TrG5h" value="getTypeTerm" />
-      <node concept="37vLTG" id="7y50OW6X2N5" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="7y50OW6X5Pn" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="7y50OW6WS2_" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="7y50OW6WPl7" role="1B3o_S" />
-      <node concept="3clFbS" id="7y50OW6WPl8" role="3clF47">
-        <node concept="3clFbF" id="1CcQBrQsVtY" role="3cqZAp">
-          <node concept="2OqwBi" id="1CcQBrQsYks" role="3clFbG">
-            <node concept="2ShNRf" id="1CcQBrQsVtU" role="2Oq$k0">
-              <node concept="1pGfFk" id="1CcQBrQsXAD" role="2ShVmc">
-                <ref role="37wK5l" node="1CcQBrQmOiH" resolve="TypeCollector" />
-                <node concept="37vLTw" id="1CcQBrQsY6g" role="37wK5m">
-                  <ref role="3cqZAo" node="1CcQBrQoJoP" resolve="storeView" />
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="1CcQBrQsYyy" role="2OqNvi">
-              <ref role="37wK5l" node="1CcQBrQmOQT" resolve="typeTerm" />
-              <node concept="2OqwBi" id="1CcQBrQt08p" role="37wK5m">
-                <node concept="2JrnkZ" id="1CcQBrQsZPk" role="2Oq$k0">
-                  <node concept="37vLTw" id="1CcQBrQsZ6l" role="2JrQYb">
-                    <ref role="3cqZAo" node="7y50OW6X2N5" resolve="node" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="1CcQBrQt0v$" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="1CcQBrQiE6s" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7y50OW6WMvj" role="jymVt" />
     <node concept="3clFb_" id="3F6vMxqj$oM" role="jymVt">
       <property role="TrG5h" value="deinitSession" />
       <node concept="3Tmbuc" id="3F6vMxqjDuA" role="1B3o_S" />
@@ -4418,32 +4376,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3F6vMxqjnci" role="jymVt" />
-    <node concept="3clFb_" id="3F6vMxql$1A" role="jymVt">
-      <property role="TrG5h" value="createSessionSolver" />
-      <node concept="37vLTG" id="3F6vMxqmh0e" role="3clF46">
-        <property role="TrG5h" value="expressionSolver" />
-        <node concept="3uibUv" id="5jCHAT2xK28" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="3F6vMxqlLKq" role="3clF45">
-        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-      </node>
-      <node concept="3Tmbuc" id="3F6vMxql$1D" role="1B3o_S" />
-      <node concept="3clFbS" id="3F6vMxql$1E" role="3clF47">
-        <node concept="3clFbF" id="3F6vMxqlO4j" role="3cqZAp">
-          <node concept="2ShNRf" id="3F6vMxqlO4l" role="3clFbG">
-            <node concept="1pGfFk" id="3F6vMxqlO4m" role="2ShVmc">
-              <ref role="37wK5l" to="cxk7:23c4kVtavpK" resolve="DefaultSessionSolver" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="23c4kVtaNNy" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="23c4kVtaRWK" role="jymVt" />
     <node concept="3clFb_" id="23c4kVtaQus" role="jymVt">
       <property role="TrG5h" value="createSessionSolver" />
       <node concept="3uibUv" id="23c4kVtaQuv" role="3clF45">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index e34bb685..3d58becf 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -5418,23 +5418,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4MqhgXUaiGi" role="jymVt" />
-    <node concept="3clFb_" id="1ggxSI7z25H" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="javaExpressionSolver" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="3Tm1VV" id="1ggxSI7z25J" role="1B3o_S" />
-      <node concept="3uibUv" id="5jCHAT2vJrl" role="3clF45">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
-      </node>
-      <node concept="3clFbS" id="1ggxSI7z25L" role="3clF47">
-        <node concept="3clFbF" id="1ggxSI7z28i" role="3cqZAp">
-          <node concept="10Nm6u" id="1fZtLFT9rfQ" role="3clFbG" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MqhgXUajfR" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUajMY" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="3cqZAl" id="4MqhgXUajN0" role="3clF45" />
@@ -15548,7 +15531,7 @@
       </node>
       <node concept="2tJIrI" id="5hSMZ_lNZhT" role="jymVt" />
       <node concept="3clFb_" id="5hSMZ_lNZhU" role="jymVt">
-        <property role="TrG5h" value="typeTerm" />
+        <property role="TrG5h" value="getTerm" />
         <property role="1EzhhJ" value="false" />
         <node concept="3uibUv" id="5hSMZ_lNZhV" role="3clF45">
           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
@@ -15947,7 +15930,7 @@
               <node concept="3clFbF" id="5hSMZ_ljA5G" role="3cqZAp">
                 <node concept="2OqwBi" id="5hSMZ_ljA5H" role="3clFbG">
                   <node concept="liA8E" id="5hSMZ_ljA5I" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
                   </node>
                   <node concept="1eOMI4" id="5hSMZ_ljA5J" role="2Oq$k0">
                     <node concept="2ShNRf" id="5hSMZ_ljA5K" role="1eOMHV">
@@ -16137,7 +16120,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5hSMZ_ljTU9" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
+                <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
               </node>
               <node concept="raruj" id="5hSMZ_ljTUa" role="lGtFl" />
             </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
index d4bd7278..53d63ec7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
@@ -1416,44 +1416,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6OUp3PsW2D7" role="jymVt" />
-    <node concept="3clFb_" id="3GlpCDSEY0I" role="jymVt">
-      <property role="TrG5h" value="occurrences" />
-      <node concept="3uibUv" id="3GlpCDSEYQC" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-        <node concept="3uibUv" id="3GlpCDSEZ0k" role="11_B2D">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3GlpCDSEY0L" role="1B3o_S" />
-      <node concept="3clFbS" id="3GlpCDSEY0M" role="3clF47">
-        <node concept="3clFbF" id="5cnt3vh3sGU" role="3cqZAp">
-          <node concept="3K4zz7" id="5cnt3vh3t15" role="3clFbG">
-            <node concept="2OqwBi" id="5cnt3vh3tae" role="3K4E3e">
-              <node concept="37vLTw" id="5cnt3vh3t3e" role="2Oq$k0">
-                <ref role="3cqZAo" node="5cnt3vh3s4F" resolve="storeView" />
-              </node>
-              <node concept="liA8E" id="5cnt3vh3tTA" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~StoreView.allOccurrences():java.lang.Iterable" resolve="allOccurrences" />
-              </node>
-            </node>
-            <node concept="2YIFZM" id="5cnt3vh3x4Q" role="3K4GZi">
-              <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
-              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            </node>
-            <node concept="3y3z36" id="5cnt3vh3sVs" role="3K4Cdx">
-              <node concept="10Nm6u" id="5cnt3vh3sW0" role="3uHU7w" />
-              <node concept="37vLTw" id="5cnt3vh3sGT" role="3uHU7B">
-                <ref role="3cqZAo" node="5cnt3vh3s4F" resolve="storeView" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5cnt3vh3xC0" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5cnt3vh3owl" role="jymVt" />
     <node concept="3clFb_" id="5cnt3vh3pb_" role="jymVt">
       <property role="TrG5h" value="storeView" />
       <node concept="3uibUv" id="5cnt3vh3pNW" role="3clF45">
@@ -4802,7 +4764,7 @@
         <node concept="3clFbH" id="6i42QSsxa9S" role="3cqZAp" />
         <node concept="3cpWs8" id="4vBwiiV8bzc" role="3cqZAp">
           <node concept="3cpWsn" id="4vBwiiV8bzf" role="3cpWs9">
-            <property role="TrG5h" value="asTypeNodes" />
+            <property role="TrG5h" value="expandedNodes" />
             <property role="3TUv4t" value="true" />
             <node concept="_YKpA" id="4vBwiiV8bz8" role="1tU5fm">
               <node concept="3Tqbb2" id="4vBwiiV8cKb" role="_ZDj9" />
@@ -4829,7 +4791,7 @@
                   <node concept="3Tm1VV" id="4vBwiiV7yNZ" role="1B3o_S" />
                   <node concept="3clFb_" id="4vBwiiV7yO0" role="jymVt">
                     <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="asType" />
+                    <property role="TrG5h" value="macroExpanded" />
                     <node concept="37vLTG" id="4vBwiiV7yO1" role="3clF46">
                       <property role="TrG5h" value="typeNode" />
                       <node concept="3Tqbb2" id="4vBwiiV7yO2" role="1tU5fm" />
@@ -4840,7 +4802,7 @@
                       <node concept="3clFbF" id="4vBwiiV8dCo" role="3cqZAp">
                         <node concept="2OqwBi" id="4vBwiiV8eDN" role="3clFbG">
                           <node concept="37vLTw" id="4vBwiiV8dCn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4vBwiiV8bzf" resolve="asTypeNodes" />
+                            <ref role="3cqZAo" node="4vBwiiV8bzf" resolve="expandedNodes" />
                           </node>
                           <node concept="TSZUe" id="4vBwiiV8gl2" role="2OqNvi">
                             <node concept="37vLTw" id="4vBwiiV8gvR" role="25WWJ7">
@@ -4862,7 +4824,7 @@
             <node concept="3clFbF" id="4vBwiiV8A41" role="3cqZAp">
               <node concept="2OqwBi" id="4vBwiiV8C0C" role="3clFbG">
                 <node concept="37vLTw" id="4vBwiiV8A3Z" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4vBwiiV8bzf" resolve="asTypeNodes" />
+                  <ref role="3cqZAo" node="4vBwiiV8bzf" resolve="expandedNodes" />
                 </node>
                 <node concept="2Kehj3" id="4vBwiiV8DII" role="2OqNvi" />
               </node>
@@ -5301,7 +5263,7 @@
                           <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
                         </node>
                         <node concept="37vLTw" id="4vBwiiV8QJb" role="37wK5m">
-                          <ref role="3cqZAo" node="4vBwiiV8bzf" resolve="asTypeNodes" />
+                          <ref role="3cqZAo" node="4vBwiiV8bzf" resolve="expandedNodes" />
                         </node>
                       </node>
                     </node>
@@ -7633,22 +7595,22 @@
             <node concept="2OqwBi" id="1hX44vNniCt" role="37vLTJ">
               <node concept="Xjq3P" id="1hX44vNniCw" role="2Oq$k0" />
               <node concept="2OwXpG" id="1hX44vNniCs" role="2OqNvi">
-                <ref role="2Oxat5" node="1hX44vNniCj" resolve="typeManifest" />
+                <ref role="2Oxat5" node="1hX44vNniCj" resolve="macroManifest" />
               </node>
             </node>
             <node concept="37vLTw" id="1hX44vNniCx" role="37vLTx">
-              <ref role="3cqZAo" node="1hX44vNlSPE" resolve="typeManifest" />
+              <ref role="3cqZAo" node="1hX44vNlSPE" resolve="macroManifest" />
             </node>
           </node>
         </node>
         <node concept="3clFbF" id="1hX44vNnpfY" role="3cqZAp">
           <node concept="1rXfSq" id="1hX44vNnpfX" role="3clFbG">
-            <ref role="37wK5l" node="1hX44vNnpfT" resolve="collectTypes" />
+            <ref role="37wK5l" node="1hX44vNnpfT" resolve="collectMacros" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="1hX44vNlSPE" role="3clF46">
-        <property role="TrG5h" value="typeManifest" />
+        <property role="TrG5h" value="macroManifest" />
         <node concept="3uibUv" id="1hX44vNlSPD" role="1tU5fm">
           <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
         </node>
@@ -7720,7 +7682,7 @@
     </node>
     <node concept="2tJIrI" id="4nxCIBqyBjc" role="jymVt" />
     <node concept="3clFb_" id="1hX44vNnpfT" role="jymVt">
-      <property role="TrG5h" value="collectTypes" />
+      <property role="TrG5h" value="collectMacros" />
       <node concept="3Tm6S6" id="1hX44vNnpfU" role="1B3o_S" />
       <node concept="3cqZAl" id="1hX44vNnpfV" role="3clF45" />
       <node concept="3clFbS" id="1hX44vNnpfH" role="3clF47">
@@ -7734,7 +7696,7 @@
             <node concept="3clFbF" id="1hX44vNnpfI" role="3cqZAp">
               <node concept="2OqwBi" id="1hX44vNnpfJ" role="3clFbG">
                 <node concept="37vLTw" id="159_25Mmht6" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1hX44vNniCj" resolve="typeManifest" />
+                  <ref role="3cqZAo" node="1hX44vNniCj" resolve="macroManifest" />
                 </node>
                 <node concept="liA8E" id="1hX44vNnpfL" role="2OqNvi">
                   <ref role="37wK5l" to="psr6:1pPth$m7IW6" resolve="collectMacroTables" />
@@ -7750,7 +7712,7 @@
           <node concept="3y3z36" id="23c4kVthiuU" role="3clFbw">
             <node concept="10Nm6u" id="23c4kVthixF" role="3uHU7w" />
             <node concept="37vLTw" id="23c4kVthilp" role="3uHU7B">
-              <ref role="3cqZAo" node="1hX44vNniCj" resolve="typeManifest" />
+              <ref role="3cqZAo" node="1hX44vNniCj" resolve="macroManifest" />
             </node>
           </node>
         </node>
@@ -7816,7 +7778,7 @@
     <node concept="3Tm1VV" id="1hX44vNlSIB" role="1B3o_S" />
     <node concept="2tJIrI" id="6DOfTm$oUp9" role="jymVt" />
     <node concept="312cEg" id="1hX44vNniCj" role="jymVt">
-      <property role="TrG5h" value="typeManifest" />
+      <property role="TrG5h" value="macroManifest" />
       <node concept="3Tm6S6" id="1hX44vNniCk" role="1B3o_S" />
       <node concept="3uibUv" id="1hX44vNniCm" role="1tU5fm">
         <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
@@ -7889,7 +7851,7 @@
                         <ref role="3cqZAo" node="4vBwiiV6Hwe" resolve="it" />
                       </node>
                       <node concept="liA8E" id="4vBwiiV6I51" role="2OqNvi">
-                        <ref role="37wK5l" to="6pyv:4vBwiiV65KJ" resolve="asType" />
+                        <ref role="37wK5l" to="6pyv:4vBwiiV65KJ" resolve="macroExpanded" />
                         <node concept="37vLTw" id="4vBwiiV6Jbv" role="37wK5m">
                           <ref role="3cqZAo" node="4QPCta1qmXx" resolve="inputNode" />
                         </node>
@@ -7907,7 +7869,7 @@
         </node>
         <node concept="3clFbF" id="4QPCta1qmXA" role="3cqZAp">
           <node concept="1rXfSq" id="4QPCta1qmXB" role="3clFbG">
-            <ref role="37wK5l" node="4QPCta1qmZo" resolve="withTypeTemplate" />
+            <ref role="37wK5l" node="4QPCta1qmZo" resolve="withMacroTemplate" />
             <node concept="2OqwBi" id="4QPCta1qmXC" role="37wK5m">
               <node concept="37vLTw" id="4QPCta1qmXD" role="2Oq$k0">
                 <ref role="3cqZAo" node="4QPCta1qmXx" resolve="inputNode" />
@@ -8013,7 +7975,7 @@
       <node concept="3clFbS" id="4QPCta1qmYb" role="3clF47">
         <node concept="3clFbF" id="4QPCta1qmYc" role="3cqZAp">
           <node concept="1rXfSq" id="4QPCta1qmYd" role="3clFbG">
-            <ref role="37wK5l" node="4QPCta1qmZT" resolve="withTypeTemplate" />
+            <ref role="37wK5l" node="4QPCta1qmZT" resolve="withMacroTemplate" />
             <node concept="37vLTw" id="4QPCta1qmYe" role="37wK5m">
               <ref role="3cqZAo" node="4QPCta1qmY4" resolve="templateId" />
             </node>
@@ -8276,7 +8238,7 @@
     </node>
     <node concept="2tJIrI" id="4vBwiiV6D$e" role="jymVt" />
     <node concept="3clFb_" id="4QPCta1qmZo" role="jymVt">
-      <property role="TrG5h" value="withTypeTemplate" />
+      <property role="TrG5h" value="withMacroTemplate" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="4QPCta1qmZp" role="3clF47">
@@ -8287,7 +8249,7 @@
         </node>
         <node concept="3cpWs8" id="4QPCta1qmZs" role="3cqZAp">
           <node concept="3cpWsn" id="4QPCta1qmZt" role="3cpWs9">
-            <property role="TrG5h" value="typeTemplate" />
+            <property role="TrG5h" value="macroTemplate" />
             <node concept="3uibUv" id="4QPCta1qmZu" role="1tU5fm">
               <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
               <node concept="16syzq" id="4QPCta1qmZv" role="11_B2D">
@@ -8329,7 +8291,7 @@
             <node concept="liA8E" id="4QPCta1qmZG" role="2OqNvi">
               <ref role="37wK5l" to="psr6:1eKXYsjvTXf" resolve="doAction" />
               <node concept="37vLTw" id="4QPCta1qmZH" role="37wK5m">
-                <ref role="3cqZAo" node="4QPCta1qmZt" resolve="typeTemplate" />
+                <ref role="3cqZAo" node="4QPCta1qmZt" resolve="macroTemplate" />
               </node>
             </node>
           </node>
@@ -8364,7 +8326,7 @@
     </node>
     <node concept="2tJIrI" id="4QPCta1qmZS" role="jymVt" />
     <node concept="3clFb_" id="4QPCta1qmZT" role="jymVt">
-      <property role="TrG5h" value="withTypeTemplate" />
+      <property role="TrG5h" value="withMacroTemplate" />
       <node concept="37vLTG" id="4QPCta1qmZU" role="3clF46">
         <property role="TrG5h" value="templateId" />
         <node concept="3uibUv" id="4QPCta1qmZV" role="1tU5fm">
@@ -8392,7 +8354,7 @@
         </node>
         <node concept="3cpWs8" id="4QPCta1qn04" role="3cqZAp">
           <node concept="3cpWsn" id="4QPCta1qn05" role="3cpWs9">
-            <property role="TrG5h" value="typeTemplate" />
+            <property role="TrG5h" value="macroTemplate" />
             <node concept="3uibUv" id="4QPCta1qn06" role="1tU5fm">
               <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
               <node concept="16syzq" id="4QPCta1qn07" role="11_B2D">
@@ -8434,7 +8396,7 @@
             <node concept="liA8E" id="4QPCta1qn0k" role="2OqNvi">
               <ref role="37wK5l" to="psr6:1eKXYsjvTXf" resolve="doAction" />
               <node concept="37vLTw" id="4QPCta1qn0l" role="37wK5m">
-                <ref role="3cqZAo" node="4QPCta1qn05" resolve="typeTemplate" />
+                <ref role="3cqZAo" node="4QPCta1qn05" resolve="macroTemplate" />
               </node>
             </node>
           </node>
@@ -8558,7 +8520,7 @@
             <node concept="2OqwBi" id="4QPCta1yTPZ" role="37vLTJ">
               <node concept="Xjq3P" id="4QPCta1yTQ0" role="2Oq$k0" />
               <node concept="2OwXpG" id="4QPCta1yTQ1" role="2OqNvi">
-                <ref role="2Oxat5" node="20Ay2VeQFsB" resolve="typeTemplatesIndex" />
+                <ref role="2Oxat5" node="20Ay2VeQFsB" resolve="macroTemplatesIndex" />
               </node>
             </node>
             <node concept="2ShNRf" id="4QPCta1yTQ2" role="37vLTx">
@@ -8674,7 +8636,7 @@
       <node concept="3clFbS" id="4QPCta1yW5c" role="3clF47">
         <node concept="3clFbF" id="4QPCta1yW5d" role="3cqZAp">
           <node concept="37vLTw" id="4QPCta1yW58" role="3clFbG">
-            <ref role="3cqZAo" node="20Ay2VeQFsB" resolve="typeTemplatesIndex" />
+            <ref role="3cqZAo" node="20Ay2VeQFsB" resolve="macroTemplatesIndex" />
           </node>
         </node>
       </node>
@@ -8696,7 +8658,7 @@
     </node>
     <node concept="2tJIrI" id="4QPCta1yWEZ" role="jymVt" />
     <node concept="312cEg" id="20Ay2VeQFsB" role="jymVt">
-      <property role="TrG5h" value="typeTemplatesIndex" />
+      <property role="TrG5h" value="macroTemplatesIndex" />
       <node concept="3Tm6S6" id="20Ay2VeQFsC" role="1B3o_S" />
       <node concept="3uibUv" id="20Ay2VeQG0r" role="1tU5fm">
         <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
index 11dd0ff9..e8d7216f 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
@@ -551,7 +551,7 @@
     <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="4MEOIDFA4bd" role="jymVt" />
     <node concept="3clFb_" id="4MEOIDFA4bP" role="jymVt">
-      <property role="TrG5h" value="typeTerm" />
+      <property role="TrG5h" value="getTerm" />
       <property role="1EzhhJ" value="true" />
       <node concept="3uibUv" id="4MEOIDFA4e5" role="3clF45">
         <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps
index cb7d3bb5..f5d5a59a 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps
@@ -2542,7 +2542,7 @@
       <property role="TrG5h" value="RuleApplicationSessionListener" />
       <node concept="3clFb_" id="4vBwiiV65KJ" role="jymVt">
         <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="asType" />
+        <property role="TrG5h" value="macroExpanded" />
         <node concept="37vLTG" id="4vBwiiV660X" role="3clF46">
           <property role="TrG5h" value="typeNode" />
           <node concept="3Tqbb2" id="4vBwiiV665_" role="1tU5fm" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
index feab28a0..a412befb 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
@@ -265,22 +265,6 @@
       <node concept="3clFbS" id="4MqhgXUaiLB" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="4MqhgXUaiL8" role="jymVt" />
-    <node concept="3clFb_" id="1ggxSI7z1S5" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="javaExpressionSolver" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="3clFbS" id="1ggxSI7z1S8" role="3clF47" />
-      <node concept="3Tm1VV" id="1ggxSI7z1OS" role="1B3o_S" />
-      <node concept="3uibUv" id="wfREvq9NGm" role="3clF45">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
-      </node>
-      <node concept="2AHcQZ" id="1fZtLFT9p_L" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4OKkcnfu_xm" role="jymVt" />
     <node concept="3Tm1VV" id="4OKkcnfu_xn" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="4OKkcnfu_zf">