diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 8f950cdc..def99cf7 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -90,10 +90,7 @@
         <child id="1164903359218" name="catchBody" index="TDEfX" />
         <child id="1164903359217" name="throwable" index="TDEfY" />
       </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA">
-        <property id="6468716278899126575" name="isVolatile" index="2dlcS1" />
-        <property id="6468716278899125786" name="isTransient" index="2dld4O" />
-      </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
         <reference id="1182955020723" name="classConcept" index="1HBi2w" />
       </concept>
@@ -114,15 +111,9 @@
         <child id="1081256993305" name="classType" index="2ZW6by" />
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
-        <child id="1070534760952" name="componentType" index="10Q1$1" />
-      </concept>
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -210,10 +201,6 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1154542696413" name="jetbrains.mps.baseLanguage.structure.ArrayCreatorWithInitializer" flags="nn" index="3g6Rrh">
-        <child id="1154542793668" name="componentType" index="3g7fb8" />
-        <child id="1154542803372" name="initValue" index="3g7hyw" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -422,50 +409,6 @@
   <node concept="312cEu" id="41ox5Vnk76a">
     <property role="TrG5h" value="ProgramEvaluator" />
     <property role="3GE5qa" value="" />
-    <node concept="2tJIrI" id="7dgRGU4ocQV" role="jymVt" />
-    <node concept="Wx3nA" id="5mr7UHcbnci" role="jymVt">
-      <property role="2dlcS1" value="false" />
-      <property role="2dld4O" value="false" />
-      <property role="TrG5h" value="PREDICATE_SYMBOLS" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm1VV" id="5mr7UHcbl_B" role="1B3o_S" />
-      <node concept="10Q1$e" id="5mr7UHcbnc4" role="1tU5fm">
-        <node concept="3uibUv" id="5mr7UHcbq0Z" role="10Q1$1">
-          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="5mr7UHcbowK" role="33vP2m">
-        <node concept="3g6Rrh" id="5mr7UHcboy8" role="2ShVmc">
-          <node concept="10M0yZ" id="5mr7UHcboyR" role="3g7hyw">
-            <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
-            <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
-          </node>
-          <node concept="10M0yZ" id="5mr7UHcboyX" role="3g7hyw">
-            <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
-            <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
-          </node>
-          <node concept="10M0yZ" id="5mr7UHcboz3" role="3g7hyw">
-            <ref role="3cqZAo" to="cxk7:5uFPQ7BZnLB" resolve="ASSERT_SYM" />
-            <ref role="1PxDUh" to="cxk7:6infEALAfer" resolve="AssertPredicate" />
-          </node>
-          <node concept="10M0yZ" id="5mr7UHcboz9" role="3g7hyw">
-            <ref role="3cqZAo" to="cxk7:5uFPQ7C26$b" resolve="BOUND_SYM" />
-            <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
-          </node>
-          <node concept="10M0yZ" id="5mr7UHcbozf" role="3g7hyw">
-            <ref role="3cqZAo" to="cxk7:5uFPQ7C279$" resolve="FREE_SYM" />
-            <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
-          </node>
-          <node concept="10M0yZ" id="5WBVN_M2xHI" role="3g7hyw">
-            <ref role="3cqZAo" to="cxk7:5WBVN_M2qrL" resolve="EVAL_SYM" />
-            <ref role="1PxDUh" to="cxk7:5WBVN_M1SJ9" resolve="EvalExpressionPredicate" />
-          </node>
-          <node concept="3uibUv" id="5mr7UHcbqo2" role="3g7fb8">
-            <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="5mr7UHcbkql" role="jymVt" />
     <node concept="2YIFZL" id="7dgRGU4oCXw" role="jymVt">
       <property role="TrG5h" value="remainingAllowed" />
@@ -893,24 +836,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="3GlpCDSD3ry" role="3cqZAp">
-          <node concept="37vLTI" id="3GlpCDSD3HK" role="3clFbG">
-            <node concept="2OqwBi" id="3GlpCDSD3OA" role="37vLTx">
-              <node concept="37vLTw" id="3GlpCDSD3Iy" role="2Oq$k0">
-                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-              </node>
-              <node concept="liA8E" id="3GlpCDSD3Yx" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
-                <node concept="37vLTw" id="3GlpCDSD3Y$" role="37wK5m">
-                  <ref role="3cqZAo" node="5mr7UHcbnci" resolve="PREDICATE_SYMBOLS" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="3GlpCDSD3rw" role="37vLTJ">
-              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="8odmgCo0jL" role="3cqZAp">
           <node concept="37vLTI" id="8odmgCo34v" role="3clFbG">
             <node concept="2OqwBi" id="8odmgCo4nu" role="37vLTx">
@@ -1205,42 +1130,6 @@
           </node>
         </node>
         <node concept="3clFbH" id="8odmgCo4LW" role="3cqZAp" />
-        <node concept="1DcWWT" id="7lt0LtQu0jy" role="3cqZAp">
-          <node concept="3clFbS" id="7lt0LtQu0j_" role="2LFqv$">
-            <node concept="3clFbF" id="7lt0LtQtR7U" role="3cqZAp">
-              <node concept="37vLTI" id="7lt0LtQtSBJ" role="3clFbG">
-                <node concept="2OqwBi" id="7lt0LtQtU6a" role="37vLTx">
-                  <node concept="37vLTw" id="7lt0LtQtU01" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-                  </node>
-                  <node concept="liA8E" id="7lt0LtQtUkF" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
-                    <node concept="37vLTw" id="7lt0LtQu3q3" role="37wK5m">
-                      <ref role="3cqZAo" node="7lt0LtQu0jA" resolve="sym" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="7lt0LtQtR7S" role="37vLTJ">
-                  <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="7lt0LtQu0jA" role="1Duv9x">
-            <property role="TrG5h" value="sym" />
-            <node concept="3uibUv" id="7lt0LtQu0jE" role="1tU5fm">
-              <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-            </node>
-          </node>
-          <node concept="2OqwBi" id="7lt0LtQu0jF" role="1DdaDG">
-            <node concept="37vLTw" id="7lt0LtQu0jG" role="2Oq$k0">
-              <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="program" />
-            </node>
-            <node concept="liA8E" id="7lt0LtQu0jH" role="2OqNvi">
-              <ref role="37wK5l" to="av0y:~Program.predicateSymbols():java.lang.Iterable" resolve="predicateSymbols" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbJ" id="5cnt3vh3_T4" role="3cqZAp">
           <node concept="3clFbS" id="5cnt3vh3_T6" role="3clFbx">
             <node concept="3clFbF" id="5cnt3vh3Fl7" role="3cqZAp">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index aa32b6b1..3f41b4a6 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -465,8 +465,8 @@
         <property role="TrG5h" value="solvers" />
         <node concept="3uibUv" id="4$YN6QuY4je" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="4$YN6Qv0YGU" role="11_B2D">
-            <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+          <node concept="3uibUv" id="4jcOV4h9W5b" role="11_B2D">
+            <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
           </node>
         </node>
       </node>
@@ -1018,8 +1018,8 @@
       <node concept="3Tm6S6" id="4$YN6QuY09G" role="1B3o_S" />
       <node concept="3uibUv" id="4$YN6QuY1ni" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="4$YN6Qv0YPb" role="11_B2D">
-          <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+        <node concept="3uibUv" id="4jcOV4h9Wch" role="11_B2D">
+          <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
         </node>
       </node>
     </node>
@@ -4494,8 +4494,8 @@
           <node concept="3cpWsn" id="4$YN6QuZ0VB" role="3cpWs9">
             <property role="TrG5h" value="solvers" />
             <node concept="_YKpA" id="4$YN6QuZ0Vd" role="1tU5fm">
-              <node concept="3uibUv" id="4$YN6Qv1$TN" role="_ZDj9">
-                <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+              <node concept="3uibUv" id="4jcOV4h9XGC" role="_ZDj9">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
               </node>
             </node>
             <node concept="2OqwBi" id="4$YN6QuZ2wV" role="33vP2m">
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index 34bbd35f..c54d22fa 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -189,9 +189,6 @@
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
-      <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" />
@@ -697,8 +694,8 @@
             <node concept="3clFb_" id="7lt0LtQv_dR" role="jymVt">
               <property role="TrG5h" value="solver" />
               <property role="1EzhhJ" value="false" />
-              <node concept="3uibUv" id="7lt0LtQv_dS" role="3clF45">
-                <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+              <node concept="3uibUv" id="4jcOV4hawSL" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
               </node>
               <node concept="3Tm1VV" id="7lt0LtQv_dT" role="1B3o_S" />
               <node concept="3clFbS" id="7lt0LtQv_dV" role="3clF47">
@@ -4244,8 +4241,8 @@
         </node>
       </node>
       <node concept="2tJIrI" id="3gNap3fZhXj" role="jymVt" />
-      <node concept="3uibUv" id="60zk4o77o9G" role="1zkMxy">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+      <node concept="3uibUv" id="4jcOV4ha_nc" role="EKbjA">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQwhN6" role="jymVt" />
@@ -4324,8 +4321,8 @@
             <node concept="3clFb_" id="7lt0LtQvGMu" role="jymVt">
               <property role="TrG5h" value="solver" />
               <property role="1EzhhJ" value="false" />
-              <node concept="3uibUv" id="7lt0LtQvGMv" role="3clF45">
-                <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+              <node concept="3uibUv" id="4jcOV4h9Zp4" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
               </node>
               <node concept="3Tm1VV" id="7lt0LtQvGMw" role="1B3o_S" />
               <node concept="3clFbS" id="7lt0LtQvGMy" role="3clF47">
@@ -4858,8 +4855,8 @@
         </node>
       </node>
       <node concept="2tJIrI" id="6infEALAT0A" role="jymVt" />
-      <node concept="3uibUv" id="60zk4o77kpg" role="1zkMxy">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+      <node concept="3uibUv" id="4jcOV4halFn" role="EKbjA">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQvXrn" role="jymVt" />
@@ -4991,8 +4988,8 @@
             <node concept="3clFb_" id="7lt0LtQvDZ7" role="jymVt">
               <property role="TrG5h" value="solver" />
               <property role="1EzhhJ" value="false" />
-              <node concept="3uibUv" id="7lt0LtQvDZ8" role="3clF45">
-                <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+              <node concept="3uibUv" id="4jcOV4ha4N1" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
               </node>
               <node concept="3Tm1VV" id="7lt0LtQvDZ9" role="1B3o_S" />
               <node concept="3clFbS" id="7lt0LtQvDZb" role="3clF47">
@@ -7346,8 +7343,8 @@
       </node>
       <node concept="2tJIrI" id="6SwZmzBBIG6" role="jymVt" />
       <node concept="3Tm1VV" id="3HJTsBn4oh0" role="1B3o_S" />
-      <node concept="3uibUv" id="60zk4o77lms" role="1zkMxy">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+      <node concept="3uibUv" id="4jcOV4hagjj" role="EKbjA">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQw52J" role="jymVt" />
@@ -7500,8 +7497,8 @@
             <node concept="3clFb_" id="7lt0LtQvKLZ" role="jymVt">
               <property role="TrG5h" value="solver" />
               <property role="1EzhhJ" value="false" />
-              <node concept="3uibUv" id="7lt0LtQvKM0" role="3clF45">
-                <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+              <node concept="3uibUv" id="4jcOV4hap4P" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
               </node>
               <node concept="3Tm1VV" id="7lt0LtQvKM1" role="1B3o_S" />
               <node concept="3clFbS" id="7lt0LtQvKM3" role="3clF47">
@@ -7572,8 +7569,8 @@
             <node concept="3clFb_" id="7lt0LtQvPGC" role="jymVt">
               <property role="TrG5h" value="solver" />
               <property role="1EzhhJ" value="false" />
-              <node concept="3uibUv" id="7lt0LtQvPGD" role="3clF45">
-                <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+              <node concept="3uibUv" id="4jcOV4hapug" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
               </node>
               <node concept="3Tm1VV" id="7lt0LtQvPGE" role="1B3o_S" />
               <node concept="3clFbS" id="7lt0LtQvPGG" role="3clF47">
@@ -7821,8 +7818,8 @@
       </node>
       <node concept="2tJIrI" id="7ISVfSIZY1" role="jymVt" />
       <node concept="3Tm1VV" id="4xBopTzrd8Z" role="1B3o_S" />
-      <node concept="3uibUv" id="60zk4o77mgW" role="1zkMxy">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+      <node concept="3uibUv" id="4jcOV4haqrh" role="EKbjA">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQwxu_" role="jymVt" />
@@ -7831,105 +7828,6 @@
       <ref role="3uigEE" node="6Kcfpq7B0Wu" resolve="AbstractPredicate" />
     </node>
   </node>
-  <node concept="312cEu" id="3F6vMxqo13Y">
-    <property role="TrG5h" value="DefaultSessionSolver" />
-    <node concept="2tJIrI" id="3F6vMxqo1bG" role="jymVt" />
-    <node concept="3clFbW" id="23c4kVtavpK" role="jymVt">
-      <node concept="3cqZAl" id="23c4kVtavpM" role="3clF45" />
-      <node concept="3Tm1VV" id="23c4kVtavpN" role="1B3o_S" />
-      <node concept="3clFbS" id="23c4kVtavpO" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="3F6vMxqo23u" role="jymVt" />
-    <node concept="3clFb_" id="3F6vMxqo28Q" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="registerSymbol" />
-      <property role="od$2w" value="false" />
-      <property role="DiZV1" value="false" />
-      <property role="2aFKle" value="false" />
-      <node concept="3Tmbuc" id="3F6vMxqo28S" role="1B3o_S" />
-      <node concept="3cqZAl" id="3F6vMxqo28T" role="3clF45" />
-      <node concept="37vLTG" id="3F6vMxqo28U" role="3clF46">
-        <property role="TrG5h" value="symbol" />
-        <node concept="3uibUv" id="3F6vMxqo28V" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~PredicateSymbol" resolve="PredicateSymbol" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3F6vMxqo28W" role="3clF46">
-        <property role="TrG5h" value="computingTracer" />
-        <node concept="3uibUv" id="3F6vMxqo28X" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationTrace" resolve="EvaluationTrace" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3F6vMxqo28Y" role="3clF47">
-        <node concept="3clFbJ" id="7lt0LtQvblr" role="3cqZAp">
-          <node concept="3clFbS" id="7lt0LtQvblt" role="3clFbx">
-            <node concept="3clFbF" id="7lt0LtQvcCW" role="3cqZAp">
-              <node concept="2OqwBi" id="7lt0LtQvcH7" role="3clFbG">
-                <node concept="Xjq3P" id="7lt0LtQvcCU" role="2Oq$k0" />
-                <node concept="liA8E" id="7lt0LtQvcPw" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~SessionSolver.registerSolver(jetbrains.mps.logic.reactor.program.PredicateSymbol,jetbrains.mps.logic.reactor.evaluation.AbstractSolver):void" resolve="registerSolver" />
-                  <node concept="37vLTw" id="7lt0LtQvcUA" role="37wK5m">
-                    <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
-                  </node>
-                  <node concept="2OqwBi" id="7lt0LtQvcY5" role="37wK5m">
-                    <node concept="1eOMI4" id="7lt0LtQvcY6" role="2Oq$k0">
-                      <node concept="10QFUN" id="7lt0LtQvcY7" role="1eOMHV">
-                        <node concept="3uibUv" id="7lt0LtQvcY8" role="10QFUM">
-                          <ref role="3uigEE" node="7lt0LtQvaw_" resolve="PredicateSymbolExt" />
-                        </node>
-                        <node concept="37vLTw" id="7lt0LtQvcY9" role="10QFUP">
-                          <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="7lt0LtQvcYa" role="2OqNvi">
-                      <ref role="37wK5l" node="7lt0LtQvaPQ" resolve="solver" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="7lt0LtQvWVx" role="3cqZAp" />
-          </node>
-          <node concept="2ZW3vV" id="7lt0LtQvbS4" role="3clFbw">
-            <node concept="3uibUv" id="7lt0LtQvcbN" role="2ZW6by">
-              <ref role="3uigEE" node="7lt0LtQvaw_" resolve="PredicateSymbolExt" />
-            </node>
-            <node concept="37vLTw" id="7lt0LtQvbzZ" role="2ZW6bz">
-              <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
-            </node>
-          </node>
-          <node concept="9aQIb" id="7lt0LtQvW_z" role="9aQIa">
-            <node concept="3clFbS" id="7lt0LtQvW_$" role="9aQI4">
-              <node concept="YS8fn" id="5mr7UHchgjZ" role="3cqZAp">
-                <node concept="2ShNRf" id="5mr7UHchgme" role="YScLw">
-                  <node concept="1pGfFk" id="5mr7UHchgDA" role="2ShVmc">
-                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                    <node concept="3cpWs3" id="5mr7UHchgIt" role="37wK5m">
-                      <node concept="37vLTw" id="5mr7UHchgKN" role="3uHU7w">
-                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
-                      </node>
-                      <node concept="Xl_RD" id="5mr7UHchgEB" role="3uHU7B">
-                        <property role="Xl_RC" value="unknown symbol: " />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="3F6vMxqo28Z" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3F6vMxqo1bP" role="jymVt" />
-    <node concept="3Tm1VV" id="3F6vMxqo13Z" role="1B3o_S" />
-    <node concept="3uibUv" id="3F6vMxqo15F" role="1zkMxy">
-      <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-    </node>
-  </node>
   <node concept="312cEu" id="5WBVN_M1SJ9">
     <property role="TrG5h" value="EvalExpressionPredicate" />
     <node concept="2tJIrI" id="5WBVN_M1T_3" role="jymVt" />
@@ -8005,8 +7903,8 @@
             <node concept="3clFb_" id="7lt0LtQvxYR" role="jymVt">
               <property role="TrG5h" value="solver" />
               <property role="1EzhhJ" value="false" />
-              <node concept="3uibUv" id="7lt0LtQvxYS" role="3clF45">
-                <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+              <node concept="3uibUv" id="4jcOV4haipB" role="3clF45">
+                <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
               </node>
               <node concept="3Tm1VV" id="7lt0LtQvxYT" role="1B3o_S" />
               <node concept="3clFbS" id="7lt0LtQvxYV" role="3clF47">
@@ -8246,8 +8144,8 @@
       </node>
       <node concept="2tJIrI" id="5WBVN_M2Qj4" role="jymVt" />
       <node concept="3Tm1VV" id="5WBVN_M2Qfa" role="1B3o_S" />
-      <node concept="3uibUv" id="5WBVN_M2Qig" role="1zkMxy">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+      <node concept="3uibUv" id="4jcOV4hamZl" role="EKbjA">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQw9Ac" role="jymVt" />
@@ -8287,11 +8185,14 @@
     <node concept="3clFb_" id="7lt0LtQvaPQ" role="jymVt">
       <property role="TrG5h" value="solver" />
       <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="7lt0LtQvaSJ" role="3clF45">
-        <ref role="3uigEE" to="w7la:~AbstractSolver" resolve="AbstractSolver" />
+      <node concept="3uibUv" id="4jcOV4h9ZOr" role="3clF45">
+        <ref role="3uigEE" to="w7la:~Solver" resolve="Solver" />
       </node>
       <node concept="3Tm1VV" id="7lt0LtQvaPT" role="1B3o_S" />
       <node concept="3clFbS" id="7lt0LtQvaPU" role="3clF47" />
+      <node concept="2AHcQZ" id="4$YN6QvnXYV" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQvpxT" role="jymVt" />
     <node concept="3clFb_" id="7lt0LtQvpyU" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 22ae3a3d..4526a879 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -341,7 +341,7 @@
       <node concept="3Tm1VV" id="oI9Yrbvrw" role="1B3o_S" />
       <node concept="3clFbS" id="oI9Yrbvrx" role="3clF47">
         <node concept="XkiVB" id="oI9Yrbvx2" role="3cqZAp">
-          <ref role="37wK5l" to="cxk7:23c4kVtavpK" resolve="DefaultSessionSolver" />
+          <ref role="37wK5l" to="w7la:~SessionSolver.&lt;init&gt;()" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -378,8 +378,8 @@
     </node>
     <node concept="2tJIrI" id="1FOQehvIsJr" role="jymVt" />
     <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
-    <node concept="3uibUv" id="7lt0LtQ_OLT" role="1zkMxy">
-      <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
+    <node concept="3uibUv" id="4jcOV4h9GqE" role="1zkMxy">
+      <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
     </node>
     <node concept="3uibUv" id="78H58oeu4oM" role="EKbjA">
       <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 07fd2012..aed10a44 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -95,10 +95,6 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
@@ -565,35 +561,6 @@
         </node>
         <node concept="3Tm1VV" id="2UGjFq4L4SG" role="1B3o_S" />
         <node concept="3clFbS" id="2UGjFq4L4SI" role="3clF47">
-          <node concept="3cpWs8" id="2tcGHBEewJ$" role="3cqZAp">
-            <node concept="3cpWsn" id="2tcGHBEewJ_" role="3cpWs9">
-              <property role="TrG5h" value="csession" />
-              <node concept="3uibUv" id="6yEjedmgUqt" role="1tU5fm">
-                <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
-              </node>
-              <node concept="2ShNRf" id="2tcGHBEewJA" role="33vP2m">
-                <node concept="1pGfFk" id="1ggxSI7$OLj" role="2ShVmc">
-                  <ref role="37wK5l" to="cxk7:23c4kVtavpK" resolve="DefaultSessionSolver" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5jPBdK_B63" role="3cqZAp">
-            <node concept="2OqwBi" id="5jPBdK_Bcd" role="3clFbG">
-              <node concept="37vLTw" id="2tcGHBEewJE" role="2Oq$k0">
-                <ref role="3cqZAo" node="2tcGHBEewJ_" resolve="csession" />
-              </node>
-              <node concept="liA8E" id="5jPBdK_Bhd" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~SessionSolver.init(jetbrains.mps.logic.reactor.program.PredicateSymbol...):void" resolve="init" />
-                <node concept="2OqwBi" id="2tcGHBEex4W" role="37wK5m">
-                  <node concept="Xjq3P" id="2tcGHBEex4X" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="2tcGHBEex4Y" role="2OqNvi">
-                    <ref role="2Oxat5" node="5jPBdK_qdB" resolve="predicateSymbols" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="5jPBdK_p5i" role="3cqZAp">
             <node concept="37vLTI" id="5jPBdK_p7U" role="3clFbG">
               <node concept="37vLTw" id="5jPBdK_p5h" role="37vLTJ">
@@ -602,8 +569,10 @@
               <node concept="2ShNRf" id="5jPBdK_pxU" role="37vLTx">
                 <node concept="1pGfFk" id="5jPBdK_qS9" role="2ShVmc">
                   <ref role="37wK5l" node="5jPBdK_qM0" resolve="TestingEvaluationSession" />
-                  <node concept="37vLTw" id="5jPBdK_DfM" role="37wK5m">
-                    <ref role="3cqZAo" node="2tcGHBEewJ_" resolve="csession" />
+                  <node concept="2ShNRf" id="4jcOV4h9MdQ" role="37wK5m">
+                    <node concept="1pGfFk" id="4jcOV4h9Mrh" role="2ShVmc">
+                      <ref role="37wK5l" to="w7la:~SessionSolver.&lt;init&gt;()" resolve="SessionSolver" />
+                    </node>
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index 86f73da6..ec2f186d 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -48,9 +48,6 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -6822,42 +6819,6 @@
     </node>
     <node concept="1KhYhu" id="3K_0akS$LUq" role="1KhZu4">
       <node concept="3clFbS" id="3K_0akS$LUr" role="2VODD2">
-        <node concept="3cpWs8" id="6yEjedm8ekr" role="3cqZAp">
-          <node concept="3cpWsn" id="6yEjedm8eks" role="3cpWs9">
-            <property role="TrG5h" value="symbols" />
-            <node concept="3uibUv" id="6yEjedm8ekt" role="1tU5fm">
-              <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
-            </node>
-            <node concept="2ShNRf" id="6yEjedm8eku" role="33vP2m">
-              <node concept="1pGfFk" id="6yEjedm8ekv" role="2ShVmc">
-                <ref role="37wK5l" to="cxk7:23c4kVtavpK" resolve="DefaultSessionSolver" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="2tcGHBEi$_e" role="3cqZAp">
-          <node concept="3SKdUq" id="2tcGHBEi$_g" role="3SKWNk">
-            <property role="3SKdUp" value="TODO: why create new solvers?" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="2tcGHBEi$gx" role="3cqZAp">
-          <node concept="2OqwBi" id="2tcGHBEi$kw" role="3clFbG">
-            <node concept="37vLTw" id="6yEjedm8eMu" role="2Oq$k0">
-              <ref role="3cqZAo" node="6yEjedm8eks" resolve="symbols" />
-            </node>
-            <node concept="liA8E" id="2tcGHBEi$nn" role="2OqNvi">
-              <ref role="37wK5l" to="w7la:~SessionSolver.init(jetbrains.mps.logic.reactor.program.PredicateSymbol...):void" resolve="init" />
-              <node concept="10M0yZ" id="2tcGHBEe$iM" role="37wK5m">
-                <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
-                <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
-              </node>
-              <node concept="10M0yZ" id="2tcGHBEe$iN" role="37wK5m">
-                <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
-                <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="3K_0akS$LUA" role="3cqZAp">
           <node concept="37vLTI" id="3K_0akS$LUB" role="3clFbG">
             <node concept="37vLTw" id="3K_0akS$LUF" role="37vLTJ">
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
index e5cac18d..56f25692 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
@@ -2090,7 +2090,7 @@
       <node concept="3Tm1VV" id="oI9Yrbvrw" role="1B3o_S" />
       <node concept="3clFbS" id="oI9Yrbvrx" role="3clF47">
         <node concept="XkiVB" id="oI9Yrbvx2" role="3cqZAp">
-          <ref role="37wK5l" to="cxk7:23c4kVtavpK" resolve="DefaultSessionSolver" />
+          <ref role="37wK5l" to="w7la:~SessionSolver.&lt;init&gt;()" resolve="SessionSolver" />
         </node>
       </node>
     </node>
@@ -2120,8 +2120,8 @@
     </node>
     <node concept="2tJIrI" id="7lt0LtQ_OM3" role="jymVt" />
     <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
-    <node concept="3uibUv" id="7lt0LtQ_OLT" role="1zkMxy">
-      <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
+    <node concept="3uibUv" id="4jcOV4h9TLE" role="1zkMxy">
+      <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
     </node>
     <node concept="3uibUv" id="oI9YrIZn4" role="EKbjA">
       <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />