diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 78b54dbd..0aa6b4f3 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -331,11 +331,6 @@
         <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
       </concept>
     </language>
-    <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
-      <concept id="6958395084019752" name="jetbrains.mps.lang.typechecking.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
-      </concept>
-    </language>
     <language id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc">
       <concept id="854183478222197450" name="samples.lambdacalc.structure.PairType" flags="ng" index="3EVAj">
         <child id="854183478222197451" name="sndType" index="3EVAi" />
@@ -396,9 +391,6 @@
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
     </language>
-    <language id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types">
-      <concept id="7345257067587627589" name="jetbrains.mps.lang.smodel.types.structure.SNodeTypeOperation" flags="ng" index="2W$R8B" />
-    </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
       <concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
         <child id="8456919074560454898" name="parameter" index="0eVf_" />
@@ -5173,330 +5165,6 @@
         </node>
       </node>
     </node>
-    <node concept="1X3_iC" id="48ZGLP8YawD" role="lGtFl">
-      <property role="3V$3am" value="template" />
-      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
-      <node concept="1nLNMY" id="48ZGLP8V7zN" role="8Wnug">
-        <property role="TrG5h" value="expr_typeNode_recovered" />
-        <node concept="3clFbS" id="48ZGLP8V7zO" role="1nLNMH">
-          <node concept="3SKdUt" id="48ZGLP8V7$0" role="3cqZAp">
-            <node concept="1PaTwC" id="589APehYwLT" role="3ndbpf">
-              <node concept="3oM_SD" id="589APehYwLU" role="1PaTwD">
-                <property role="3oM_SC" value="If" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwLV" role="1PaTwD">
-                <property role="3oM_SC" value="type" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwLW" role="1PaTwD">
-                <property role="3oM_SC" value="node" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwLX" role="1PaTwD">
-                <property role="3oM_SC" value="for" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwLY" role="1PaTwD">
-                <property role="3oM_SC" value="this" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwLZ" role="1PaTwD">
-                <property role="3oM_SC" value="type" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM0" role="1PaTwD">
-                <property role="3oM_SC" value="is" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM1" role="1PaTwD">
-                <property role="3oM_SC" value="already" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM2" role="1PaTwD">
-                <property role="3oM_SC" value="known," />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM3" role="1PaTwD">
-                <property role="3oM_SC" value="use" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM4" role="1PaTwD">
-                <property role="3oM_SC" value="it" />
-              </node>
-            </node>
-          </node>
-          <node concept="3SKdUt" id="48ZGLP8V7$2" role="3cqZAp">
-            <node concept="1PaTwC" id="589APehYwM5" role="3ndbpf">
-              <node concept="3oM_SD" id="589APehYwM6" role="1PaTwD">
-                <property role="3oM_SC" value="and" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM7" role="1PaTwD">
-                <property role="3oM_SC" value="prevent" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM8" role="1PaTwD">
-                <property role="3oM_SC" value="second" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwM9" role="1PaTwD">
-                <property role="3oM_SC" value="recover" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwMa" role="1PaTwD">
-                <property role="3oM_SC" value="by" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwMb" role="1PaTwD">
-                <property role="3oM_SC" value="discarding" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwMc" role="1PaTwD">
-                <property role="3oM_SC" value="typeOf" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwMd" role="1PaTwD">
-                <property role="3oM_SC" value="constraint" />
-              </node>
-            </node>
-          </node>
-          <node concept="1nLNNL" id="48ZGLP8V7$4" role="3cqZAp">
-            <node concept="1nLNMm" id="48ZGLP8V7$5" role="1nLNNK">
-              <node concept="0eUR_" id="48ZGLP8V7$6" role="0UC6o">
-                <node concept="3NuqgR" id="48ZGLP8V7$7" role="0eVf_">
-                  <node concept="aZer4" id="48ZGLP8V7$8" role="3XD1gS">
-                    <property role="TrG5h" value="Node" />
-                  </node>
-                  <node concept="3Tqbb2" id="48ZGLP8V7$9" role="3vLBG7" />
-                </node>
-                <node concept="3NuqgR" id="48ZGLP8V7$a" role="0eVf_">
-                  <node concept="aZer4" id="48ZGLP8V7$b" role="3XD1gS">
-                    <property role="TrG5h" value="Type" />
-                  </node>
-                </node>
-                <node concept="3NuqgR" id="48ZGLP8V7$c" role="0eVf_">
-                  <node concept="aZer4" id="48ZGLP8V7$d" role="3XD1gS">
-                    <property role="TrG5h" value="VN" />
-                  </node>
-                  <node concept="3uibUv" id="48ZGLP8V7$e" role="3vLBG7">
-                    <ref role="3uigEE" node="492bFERos2W" resolve="VarNames" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq93q" id="48ZGLP8V7$f" role="1nLNMb">
-                <node concept="3I6sU6" id="48ZGLP8V7$g" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="48ZGLP8V7$h" role="3I6sU7">
-                    <node concept="3Aqt3T" id="48ZGLP8V7$i" role="3I6s78">
-                      <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
-                      <node concept="37jhX" id="1TH_SRmhrcP" role="3AunhB">
-                        <node concept="2OqwBi" id="1TH_SRlXDeN" role="37jj2">
-                          <node concept="3A2sRY" id="48ZGLP8V7$k" role="2Oq$k0">
-                            <ref role="3A2yKK" node="48ZGLP8V7_7" resolve="tpbl" />
-                          </node>
-                          <node concept="iZEcu" id="1TH_SRlXDeO" role="2OqNvi" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="48ZGLP8V7$l" role="3AunhB">
-                        <ref role="a7OzE" node="48ZGLP8V7$b" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq93q" id="48ZGLP8V7$m" role="1nLNMb">
-                <property role="3ArMco" value="true" />
-                <node concept="3I6sU6" id="48ZGLP8V7$n" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="48ZGLP8V7$o" role="3I6sU7">
-                    <node concept="3Aqt3T" id="48ZGLP8V7$p" role="3I6s78">
-                      <ref role="3AqCNq" node="4dPZ2m2i60v" resolve="recover" />
-                      <node concept="a7P8L" id="48ZGLP8V7$q" role="3AunhB">
-                        <ref role="a7OzE" node="48ZGLP8V7$8" resolve="Node" />
-                      </node>
-                      <node concept="a7P8L" id="48ZGLP8V7$r" role="3AunhB">
-                        <ref role="a7OzE" node="48ZGLP8V7$d" resolve="VN" />
-                      </node>
-                      <node concept="a7P8L" id="48ZGLP8V7$s" role="3AunhB">
-                        <ref role="a7OzE" node="48ZGLP8V7$b" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="48ZGLP8V7$t" role="1nLNMd">
-                <node concept="3I6sU6" id="48ZGLP8V7$u" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="48ZGLP8V7$v" role="3I6sU7">
-                    <node concept="3wWvb2" id="48ZGLP8V7$w" role="3I6s78">
-                      <node concept="2OqwBi" id="48ZGLP8V7$x" role="3wWo3s">
-                        <node concept="2OqwBi" id="48ZGLP8V7$y" role="2Oq$k0">
-                          <node concept="3A2sRY" id="48ZGLP8V7$z" role="2Oq$k0">
-                            <ref role="3A2yKK" node="48ZGLP8V7_7" resolve="tpbl" />
-                          </node>
-                          <node concept="2W$R8B" id="48ZGLP8V7$$" role="2OqNvi" />
-                        </node>
-                        <node concept="2ra22R" id="48ZGLP8V7$_" role="2OqNvi">
-                          <node concept="1TmgYN" id="48ZGLP8V7$A" role="2ra2ae">
-                            <node concept="1nq8_$" id="48ZGLP8V7$B" role="1Tms7$">
-                              <node concept="a7P8L" id="48ZGLP8V7$C" role="1nq8_t">
-                                <ref role="a7OzE" node="48ZGLP8V7$8" resolve="Node" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9_M" id="48ZGLP8V8qH" role="1nLNMa">
-                <node concept="3I6sU6" id="48ZGLP8V8qI" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="48ZGLP8V8qM" role="3I6sU7">
-                    <node concept="2aM9Np" id="48ZGLP8V8qL" role="3I6s78">
-                      <node concept="a7P8L" id="48ZGLP8V8qP" role="2aLmnP">
-                        <ref role="a7OzE" node="48ZGLP8V7$8" resolve="Node" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2t___k" id="48ZGLP8V7_6" role="1nLNMg">
-          <ref role="2t_S0q" to="8tt8:3TFdEPZf9SZ" resolve="Typeable" />
-          <node concept="3A20r5" id="48ZGLP8V7_7" role="2t_VXX">
-            <property role="TrG5h" value="tpbl" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1X3_iC" id="48ZGLP8YajC" role="lGtFl">
-      <property role="3V$3am" value="template" />
-      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
-      <node concept="1nLNMY" id="48ZGLP8Um77" role="8Wnug">
-        <property role="TrG5h" value="expr_typeNode_recover" />
-        <node concept="3clFbS" id="48ZGLP8Um78" role="1nLNMH">
-          <node concept="3cpWs8" id="48ZGLP8Um79" role="3cqZAp">
-            <node concept="3cpWsn" id="48ZGLP8Um7a" role="3cpWs9">
-              <property role="TrG5h" value="ptr" />
-              <node concept="2sp9CU" id="48ZGLP8Um7b" role="1tU5fm">
-                <ref role="2sp9C9" to="8tt8:7_8aRkgDGQB" resolve="Clause" />
-              </node>
-              <node concept="2OqwBi" id="48ZGLP8Um7c" role="33vP2m">
-                <node concept="2OqwBi" id="48ZGLP8Um7d" role="2Oq$k0">
-                  <node concept="3A2sRY" id="48ZGLP8Um7e" role="2Oq$k0">
-                    <ref role="3A2yKK" node="48ZGLP8Um7W" resolve="tpbl" />
-                  </node>
-                  <node concept="2Xjw5R" id="48ZGLP8Um7f" role="2OqNvi">
-                    <node concept="1xMEDy" id="48ZGLP8Um7g" role="1xVPHs">
-                      <node concept="chp4Y" id="48ZGLP8Um7h" role="ri$Ld">
-                        <ref role="cht4Q" to="8tt8:7_8aRkgDGQB" resolve="Clause" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="iZEcu" id="48ZGLP8Um7i" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="48ZGLP8V7Yz" role="3cqZAp" />
-          <node concept="3SKdUt" id="48ZGLP8UqNr" role="3cqZAp">
-            <node concept="1PaTwC" id="589APehYwMe" role="3ndbpf">
-              <node concept="3oM_SD" id="589APehYwMf" role="1PaTwD">
-                <property role="3oM_SC" value="Otherwise," />
-              </node>
-              <node concept="3oM_SD" id="589APehYwMg" role="1PaTwD">
-                <property role="3oM_SC" value="just" />
-              </node>
-              <node concept="3oM_SD" id="589APehYwMh" role="1PaTwD">
-                <property role="3oM_SC" value="recover" />
-              </node>
-            </node>
-          </node>
-          <node concept="1nLNNL" id="48ZGLP8UqBg" role="3cqZAp">
-            <node concept="1nLNMm" id="48ZGLP8UqBh" role="1nLNNK">
-              <node concept="0eUR_" id="48ZGLP8UqBi" role="0UC6o">
-                <node concept="3NuqgR" id="48ZGLP8UqBj" role="0eVf_">
-                  <node concept="aZer4" id="48ZGLP8UqBk" role="3XD1gS">
-                    <property role="TrG5h" value="Node" />
-                  </node>
-                  <node concept="3Tqbb2" id="48ZGLP8UqBl" role="3vLBG7" />
-                </node>
-                <node concept="3NuqgR" id="48ZGLP8UqBm" role="0eVf_">
-                  <node concept="aZer4" id="48ZGLP8UqBn" role="3XD1gS">
-                    <property role="TrG5h" value="Type" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq93q" id="48ZGLP8UqBr" role="1nLNMb">
-                <node concept="3I6sU6" id="48ZGLP8UqBs" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="48ZGLP8UqBv" role="3I6sU7">
-                    <node concept="3Aqt3T" id="48ZGLP8UqBw" role="3I6s78">
-                      <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
-                      <node concept="37jhX" id="1TH_SRmhrcQ" role="3AunhB">
-                        <node concept="2OqwBi" id="1TH_SRlXDeP" role="37jj2">
-                          <node concept="3A2sRY" id="48ZGLP8UqBy" role="2Oq$k0">
-                            <ref role="3A2yKK" node="48ZGLP8Um7W" resolve="tpbl" />
-                          </node>
-                          <node concept="iZEcu" id="1TH_SRlXDeQ" role="2OqNvi" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="48ZGLP8UqBz" role="3AunhB">
-                        <ref role="a7OzE" node="48ZGLP8UqBn" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq93q" id="48ZGLP8V8qb" role="1nLNMb">
-                <property role="3ArMco" value="true" />
-                <node concept="3I6sU6" id="48ZGLP8V8qc" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="48ZGLP8UqBt" role="3I6sU7">
-                    <node concept="3Aqt3T" id="48ZGLP8UqBu" role="3I6s78">
-                      <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="48ZGLP8UqB$" role="1nLNMd">
-                <node concept="3I6sU6" id="48ZGLP8UqB_" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="48ZGLP8UqBA" role="3I6sU7">
-                    <node concept="3Aqt3T" id="48ZGLP8UqBB" role="3I6s78">
-                      <ref role="3AqCNq" node="4dPZ2m2i60v" resolve="recover" />
-                      <node concept="a7P8L" id="48ZGLP8UqBC" role="3AunhB">
-                        <ref role="a7OzE" node="48ZGLP8UqBk" resolve="Node" />
-                      </node>
-                      <node concept="HKQnh" id="48ZGLP8UqBD" role="3AunhB">
-                        <node concept="2YIFZM" id="48ZGLP8UqBE" role="HKQng">
-                          <ref role="37wK5l" node="6EwjVjWuHeb" resolve="forClause" />
-                          <ref role="1Pybhc" node="492bFERos2W" resolve="VarNames" />
-                          <node concept="37vLTw" id="48ZGLP8UqBF" role="37wK5m">
-                            <ref role="3cqZAo" node="48ZGLP8Um7a" resolve="ptr" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="48ZGLP8UqBG" role="3AunhB">
-                        <ref role="a7OzE" node="48ZGLP8UqBn" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="48ZGLP8V8rp" role="3I6sU7">
-                    <node concept="3wWvb2" id="48ZGLP8V8rq" role="3I6s78">
-                      <node concept="2OqwBi" id="48ZGLP8V8rr" role="3wWo3s">
-                        <node concept="2OqwBi" id="48ZGLP8V8rs" role="2Oq$k0">
-                          <node concept="3A2sRY" id="48ZGLP8V8rt" role="2Oq$k0">
-                            <ref role="3A2yKK" node="48ZGLP8Um7W" resolve="tpbl" />
-                          </node>
-                          <node concept="2W$R8B" id="48ZGLP8V8ru" role="2OqNvi" />
-                        </node>
-                        <node concept="2ra22R" id="48ZGLP8V8rv" role="2OqNvi">
-                          <node concept="1TmgYN" id="48ZGLP8V8rw" role="2ra2ae">
-                            <node concept="1nq8_$" id="48ZGLP8V8rx" role="1Tms7$">
-                              <node concept="a7P8L" id="48ZGLP8V8ry" role="1nq8_t">
-                                <ref role="a7OzE" node="48ZGLP8UqBk" resolve="Node" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2t___k" id="48ZGLP8Um7V" role="1nLNMg">
-          <ref role="2t_S0q" to="8tt8:3TFdEPZf9SZ" resolve="Typeable" />
-          <node concept="3A20r5" id="48ZGLP8Um7W" role="2t_VXX">
-            <property role="TrG5h" value="tpbl" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="1nLNMY" id="2O9ahh6HZPO" role="1nK1Vg">
       <property role="TrG5h" value="recover_varRef" />
       <node concept="3clFbS" id="2O9ahh6HZPP" role="1nLNMH">