diff --git a/.gitignore b/.gitignore
index 6caac5cb50..d85081d7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,9 @@ projectlibraries.overrides.properties
 # Test results
 TESTS-*.xml
 /system/
+
+# -----------------------------------------------------------
+# Localized configuration
+# -----------------------------------------------------------
+.mpsconfig
+.ideaconfig
\ No newline at end of file
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
index a32f3944e8..81e13ddeaf 100644
--- a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
+++ b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
@@ -22,11 +22,11 @@
     <dependency reexport="false">b341759a-c721-4072-90cf-328bb2724684(com.mbeddr.cpp.expressions)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">223dd778-c44f-4ef3-9535-7aa7d12244a6(com.mbeddr.core.debug)</dependency>
     <dependency reexport="false">cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)</dependency>
     <dependency reexport="false">20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)</dependency>
     <dependency reexport="false">984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)</dependency>
     <dependency reexport="false">3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)</dependency>
+    <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
index 80f8ea4ab7..1f7d76b8d8 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
@@ -11,7 +11,6 @@
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="-1" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="ebb5e132-d298-4649-b320-b3f4d7f3acff" name="com.mbeddr.core.debug.blext" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -31,14 +30,11 @@
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="yq40" ref="r:152b3fc0-83a1-4bab-a8cd-565eb8483785(com.mbeddr.core.pointers.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
-    <import index="x30c" ref="r:04a32be8-7074-4c9c-b2f8-77d4a01a19dc(com.mbeddr.core.debug.debugger)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="exl8" ref="r:9058158e-0926-42f8-8d00-d1d86f1ff722(com.mbeddr.core.debug.behavior)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="2eq1" ref="r:383be79d-d39d-4dc4-9df3-57e57bcac2b5(jetbrains.mps.ide.platform.watching)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="iq8l" ref="r:ffb23717-2675-4f36-b47c-a7d3b95c99a7(com.mbeddr.core.expressions.runtime.plugin)" />
-    <import index="1s42" ref="r:d482a2e6-b3ef-4c45-883b-cf624a56b653(com.mbeddr.core.pointers.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -96,9 +92,6 @@
         <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
         <reference id="1144432896254" name="enumClass" index="1Px2BO" />
       </concept>
-      <concept id="1201385106094" name="jetbrains.mps.baseLanguage.structure.PropertyReference" flags="nn" index="2S8uIT">
-        <reference id="1201385237847" name="property" index="2S8YL0" />
-      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
@@ -108,13 +101,6 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
-        <child id="1164991057263" name="throwable" index="YScLw" />
-      </concept>
-      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
-        <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>
@@ -153,7 +139,6 @@
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
-        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
@@ -173,10 +158,6 @@
       </concept>
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
-        <child id="1206060619838" name="condition" index="3eO9$A" />
-        <child id="1206060644605" name="statementList" index="3eOfB_" />
-      </concept>
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
@@ -189,12 +170,9 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
@@ -269,12 +247,6 @@
         <child id="8182547171709752112" name="expression" index="36biLW" />
       </concept>
     </language>
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
-        <property id="6332851714983843871" name="severity" index="2xdLsb" />
-        <child id="5721587534047265374" name="message" index="9lYJi" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="4705942098322609812" name="jetbrains.mps.lang.smodel.structure.EnumMember_IsOperation" flags="ng" index="21noJN">
         <child id="4705942098322609813" name="member" index="21noJM" />
@@ -17571,234 +17543,6 @@
       <node concept="17QB3L" id="4XMHJL4Gf_Y" role="3clF45" />
       <node concept="3Tm1VV" id="4XMHJL4Gf_Z" role="1B3o_S" />
     </node>
-    <node concept="13i0hz" id="7M6JlBay7Ma" role="13h7CS">
-      <property role="TrG5h" value="mapVariable" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <ref role="13i0hy" to="ywuz:7M6JlBawXfg" resolve="mapVariable" />
-      <node concept="3Tm1VV" id="7M6JlBay7Mb" role="1B3o_S" />
-      <node concept="3clFbS" id="7M6JlBay7Mc" role="3clF47">
-        <node concept="3cpWs8" id="6dGtzfiOOwB" role="3cqZAp">
-          <node concept="3cpWsn" id="6dGtzfiOOwC" role="3cpWs9">
-            <property role="TrG5h" value="mappedVar" />
-            <node concept="3uibUv" id="6dGtzfiOOwD" role="1tU5fm">
-              <ref role="3uigEE" to="x30c:7M6JlBawPkK" resolve="AbstractMappedVariable" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="6dGtzfiOOvW" role="3cqZAp">
-          <node concept="3clFbS" id="6dGtzfiOOvX" role="3clFbx">
-            <node concept="1X3_iC" id="7RTlUgf$8OW" role="lGtFl">
-              <property role="3V$3am" value="statement" />
-              <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-              <node concept="2xdQw9" id="2Fugwv5Qj7n" role="8Wnug">
-                <property role="2xdLsb" value="h1akgim/info" />
-                <node concept="Xl_RD" id="6dGtzfiORJe" role="9lYJi">
-                  <property role="Xl_RC" value="cVar instanceof CPointerVar" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="7M6JlBay826" role="3cqZAp">
-              <node concept="3cpWsn" id="7M6JlBay827" role="3cpWs9">
-                <property role="TrG5h" value="pointerValue" />
-                <node concept="3uibUv" id="7M6JlBay828" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                  <node concept="3uibUv" id="7M6JlBay82a" role="11_B2D">
-                    <ref role="3uigEE" to="x30c:7M6JlBawPkK" resolve="AbstractMappedVariable" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="7M6JlBay82c" role="33vP2m">
-                  <node concept="1pGfFk" id="7M6JlBay82e" role="2ShVmc">
-                    <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
-                    <node concept="3uibUv" id="7M6JlBay82g" role="1pMfVU">
-                      <ref role="3uigEE" to="x30c:7M6JlBawPkK" resolve="AbstractMappedVariable" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7M6JlBay82i" role="3cqZAp">
-              <node concept="2OqwBi" id="7M6JlBay82k" role="3clFbG">
-                <node concept="37vLTw" id="7M6JlBay82j" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7M6JlBay827" resolve="pointerValue" />
-                </node>
-                <node concept="liA8E" id="7M6JlBay82o" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                  <node concept="2OqwBi" id="7M6JlBay7Mw" role="37wK5m">
-                    <node concept="1PxgMI" id="7jSUHHviGFU" role="2Oq$k0">
-                      <node concept="chp4Y" id="79i$vAY5OOh" role="3oSUPX">
-                        <ref role="cht4Q" to="mj1l:7FQByU3CrCQ" resolve="Type" />
-                      </node>
-                      <node concept="2OqwBi" id="7M6JlBay7Mr" role="1m5AlR">
-                        <node concept="13iPFW" id="7M6JlBay7Mq" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="2$xXL4Pe1UM" role="2OqNvi">
-                          <ref role="3Tt5mk" to="c4fa:6IWRcVPT6tm" resolve="baseType" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2qgKlT" id="7M6JlBay7M$" role="2OqNvi">
-                      <ref role="37wK5l" to="ywuz:7M6JlBawXfg" resolve="mapVariable" />
-                      <node concept="3cpWs3" id="7M6JlBay9nl" role="37wK5m">
-                        <node concept="Xl_RD" id="7M6JlBay9no" role="3uHU7B">
-                          <property role="Xl_RC" value="&amp;" />
-                        </node>
-                        <node concept="37vLTw" id="7M6JlBay7M_" role="3uHU7w">
-                          <ref role="3cqZAo" node="7M6JlBay7Md" resolve="mbeddrVarName" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="7M6JlBay82z" role="37wK5m">
-                        <node concept="1eOMI4" id="7M6JlBay82y" role="2Oq$k0">
-                          <node concept="10QFUN" id="7M6JlBay82u" role="1eOMHV">
-                            <node concept="3uibUv" id="7M6JlBay82x" role="10QFUM">
-                              <ref role="3uigEE" to="x30c:7M6JlBawXh9" resolve="CSimplePointerVariable" />
-                            </node>
-                            <node concept="37vLTw" id="7M6JlBay7MB" role="10QFUP">
-                              <ref role="3cqZAo" node="7M6JlBay7Mf" resolve="cVariable" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2S8uIT" id="7M6JlBay82B" role="2OqNvi">
-                          <ref role="2S8YL0" to="x30c:7M6JlBawXha" resolve="pointingValue" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="6dGtzfiOOwH" role="3cqZAp">
-              <node concept="37vLTI" id="6dGtzfiOOwJ" role="3clFbG">
-                <node concept="37vLTw" id="5Hxjapweq9I" role="37vLTJ">
-                  <ref role="3cqZAo" node="6dGtzfiOOwC" resolve="mappedVar" />
-                </node>
-                <node concept="2ShNRf" id="7M6JlBay81R" role="37vLTx">
-                  <node concept="1pGfFk" id="7M6JlBay81T" role="2ShVmc">
-                    <ref role="37wK5l" to="x30c:7M6JlBawWT5" resolve="ComplexMappedVariable" />
-                    <node concept="37vLTw" id="7M6JlBay81U" role="37wK5m">
-                      <ref role="3cqZAo" node="7M6JlBay7Md" resolve="mbeddrVarName" />
-                    </node>
-                    <node concept="2OqwBi" id="7M6JlBay81X" role="37wK5m">
-                      <node concept="37vLTw" id="7M6JlBay81W" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7M6JlBay7Mf" resolve="cVariable" />
-                      </node>
-                      <node concept="2S8uIT" id="7M6JlBay821" role="2OqNvi">
-                        <ref role="2S8YL0" to="x30c:7M6JlBawXgq" resolve="valueRepresentation" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="5HxjapwgHfh" role="37wK5m">
-                      <ref role="3cqZAo" node="7M6JlBay827" resolve="pointerValue" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2ZW3vV" id="6dGtzfiOOw3" role="3clFbw">
-            <node concept="3uibUv" id="6dGtzfiOOw7" role="2ZW6by">
-              <ref role="3uigEE" to="x30c:7M6JlBawXh9" resolve="CSimplePointerVariable" />
-            </node>
-            <node concept="37vLTw" id="6dGtzfiOOw8" role="2ZW6bz">
-              <ref role="3cqZAo" node="7M6JlBay7Mf" resolve="cVariable" />
-            </node>
-          </node>
-          <node concept="3eNFk2" id="6dGtzfiOOw9" role="3eNLev">
-            <node concept="3clFbS" id="6dGtzfiOOwb" role="3eOfB_">
-              <node concept="1X3_iC" id="7RTlUgf$95a" role="lGtFl">
-                <property role="3V$3am" value="statement" />
-                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                <node concept="2xdQw9" id="2Fugwv5Qjrd" role="8Wnug">
-                  <property role="2xdLsb" value="h1akgim/info" />
-                  <node concept="Xl_RD" id="6dGtzfiORJ7" role="9lYJi">
-                    <property role="Xl_RC" value="cVar instanceof CVarrVar" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="6u6AsDiCjFX" role="3cqZAp">
-                <node concept="37vLTI" id="6u6AsDiCjFZ" role="3clFbG">
-                  <node concept="37vLTw" id="5Hxjapweqc8" role="37vLTJ">
-                    <ref role="3cqZAo" node="6dGtzfiOOwC" resolve="mappedVar" />
-                  </node>
-                  <node concept="2OqwBi" id="6u6AsDiCjG2" role="37vLTx">
-                    <node concept="2ShNRf" id="6u6AsDiC8Ih" role="2Oq$k0">
-                      <node concept="3zrR0B" id="6u6AsDiC8Ii" role="2ShVmc">
-                        <node concept="3Tqbb2" id="6u6AsDiC8Ij" role="3zrR0E">
-                          <ref role="ehGHo" to="yq40:4VhroexOKM1" resolve="ArrayType" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2qgKlT" id="6u6AsDiCjG6" role="2OqNvi">
-                      <ref role="37wK5l" to="1s42:6u6AsDiCjEf" resolve="mapArrayVariable" />
-                      <node concept="2OqwBi" id="6u6AsDiCjG8" role="37wK5m">
-                        <node concept="13iPFW" id="6u6AsDiCjG7" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="2$xXL4Pe08x" role="2OqNvi">
-                          <ref role="3Tt5mk" to="c4fa:6IWRcVPT6tm" resolve="baseType" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="6u6AsDiCjGg" role="37wK5m">
-                        <ref role="3cqZAo" node="7M6JlBay7Md" resolve="mbeddrVarName" />
-                      </node>
-                      <node concept="37vLTw" id="6u6AsDiCjGh" role="37wK5m">
-                        <ref role="3cqZAo" node="7M6JlBay7Mf" resolve="cVariable" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2ZW3vV" id="6dGtzfiOOwc" role="3eO9$A">
-              <node concept="3uibUv" id="6dGtzfiOOwf" role="2ZW6by">
-                <ref role="3uigEE" to="x30c:7M6JlBawXgy" resolve="CArrayVariable" />
-              </node>
-              <node concept="37vLTw" id="6dGtzfiOOwe" role="2ZW6bz">
-                <ref role="3cqZAo" node="7M6JlBay7Mf" resolve="cVariable" />
-              </node>
-            </node>
-          </node>
-          <node concept="9aQIb" id="6dGtzfiOOwj" role="9aQIa">
-            <node concept="3clFbS" id="6dGtzfiOOwk" role="9aQI4">
-              <node concept="YS8fn" id="6dGtzfiOOwl" role="3cqZAp">
-                <node concept="2ShNRf" id="6dGtzfiOOwn" role="YScLw">
-                  <node concept="1pGfFk" id="6dGtzfiOOwp" role="2ShVmc">
-                    <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
-                    <node concept="3cpWs3" id="6dGtzfiOOwr" role="37wK5m">
-                      <node concept="2OqwBi" id="6dGtzfiOOwv" role="3uHU7w">
-                        <node concept="37vLTw" id="6dGtzfiOOwu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7M6JlBay7Mf" resolve="cVariable" />
-                        </node>
-                        <node concept="2S8uIT" id="6dGtzfiOOwz" role="2OqNvi">
-                          <ref role="2S8YL0" to="x30c:7M6JlBawXgj" resolve="identifier" />
-                        </node>
-                      </node>
-                      <node concept="Xl_RD" id="6dGtzfiOOwq" role="3uHU7B">
-                        <property role="Xl_RC" value="Could not map Variable: " />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="6dGtzfiOPLy" role="3cqZAp">
-          <node concept="37vLTw" id="6dGtzfiOPL$" role="3cqZAk">
-            <ref role="3cqZAo" node="6dGtzfiOOwC" resolve="mappedVar" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7M6JlBay7Md" role="3clF46">
-        <property role="TrG5h" value="mbeddrVarName" />
-        <node concept="17QB3L" id="7M6JlBay7Me" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7M6JlBay7Mf" role="3clF46">
-        <property role="TrG5h" value="cVariable" />
-        <node concept="3uibUv" id="7M6JlBay7Mg" role="1tU5fm">
-          <ref role="3uigEE" to="x30c:7M6JlBawXge" resolve="CVariable" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="7M6JlBay7Mh" role="3clF45">
-        <ref role="3uigEE" to="x30c:7M6JlBawPkK" resolve="AbstractMappedVariable" />
-      </node>
-    </node>
     <node concept="13i0hz" id="6o2p2Z0BLy0" role="13h7CS">
       <property role="TrG5h" value="getSymbolForGenericDotOperation" />
       <property role="13i0it" value="false" />
@@ -17814,132 +17558,6 @@
       </node>
       <node concept="17QB3L" id="6o2p2Z0BLy7" role="3clF45" />
     </node>
-    <node concept="13i0hz" id="6u6AsDiCjxq" role="13h7CS">
-      <property role="TrG5h" value="mapPointerVariable" />
-      <node concept="37vLTG" id="6u6AsDiCjD8" role="3clF46">
-        <property role="TrG5h" value="baseType" />
-        <node concept="3Tqbb2" id="6u6AsDiCjDa" role="1tU5fm">
-          <ref role="ehGHo" to="tpck:hYa1RjM" resolve="IType" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6u6AsDiCjDd" role="3clF46">
-        <property role="TrG5h" value="mbeddrVarName" />
-        <node concept="17QB3L" id="6u6AsDiCjDe" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="6u6AsDiCjDf" role="3clF46">
-        <property role="TrG5h" value="cVariable" />
-        <node concept="3uibUv" id="6u6AsDiCjDg" role="1tU5fm">
-          <ref role="3uigEE" to="x30c:7M6JlBawXge" resolve="CVariable" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6u6AsDiCjxr" role="1B3o_S" />
-      <node concept="3uibUv" id="6u6AsDiCjDh" role="3clF45">
-        <ref role="3uigEE" to="x30c:7M6JlBawPkK" resolve="AbstractMappedVariable" />
-      </node>
-      <node concept="3clFbS" id="6u6AsDiCjxt" role="3clF47">
-        <node concept="3cpWs8" id="6u6AsDiCjDi" role="3cqZAp">
-          <node concept="3cpWsn" id="6u6AsDiCjDj" role="3cpWs9">
-            <property role="TrG5h" value="pointerValue" />
-            <node concept="3uibUv" id="6u6AsDiCjDk" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~List" resolve="List" />
-              <node concept="3uibUv" id="6u6AsDiCjDl" role="11_B2D">
-                <ref role="3uigEE" to="x30c:7M6JlBawPkK" resolve="AbstractMappedVariable" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6u6AsDiCjDm" role="33vP2m">
-              <node concept="1pGfFk" id="6u6AsDiCjDn" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
-                <node concept="3uibUv" id="6u6AsDiCjDo" role="1pMfVU">
-                  <ref role="3uigEE" to="x30c:7M6JlBawPkK" resolve="AbstractMappedVariable" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6u6AsDiCjDp" role="3cqZAp">
-          <node concept="2OqwBi" id="6u6AsDiCjDq" role="3clFbG">
-            <node concept="37vLTw" id="5Hxjapweqfa" role="2Oq$k0">
-              <ref role="3cqZAo" node="6u6AsDiCjDj" resolve="pointerValue" />
-            </node>
-            <node concept="liA8E" id="6u6AsDiCjDs" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-              <node concept="2OqwBi" id="6u6AsDiCjDt" role="37wK5m">
-                <node concept="1PxgMI" id="7jSUHHviGGj" role="2Oq$k0">
-                  <node concept="chp4Y" id="79i$vAY5OOs" role="3oSUPX">
-                    <ref role="cht4Q" to="mj1l:7FQByU3CrCQ" resolve="Type" />
-                  </node>
-                  <node concept="37vLTw" id="6u6AsDiCjDR" role="1m5AlR">
-                    <ref role="3cqZAo" node="6u6AsDiCjD8" resolve="baseType" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="6u6AsDiCjDx" role="2OqNvi">
-                  <ref role="37wK5l" to="ywuz:7M6JlBawXfg" resolve="mapVariable" />
-                  <node concept="3cpWs3" id="6u6AsDiCjDy" role="37wK5m">
-                    <node concept="Xl_RD" id="6u6AsDiCjDz" role="3uHU7B">
-                      <property role="Xl_RC" value="&amp;" />
-                    </node>
-                    <node concept="37vLTw" id="6u6AsDiCjD$" role="3uHU7w">
-                      <ref role="3cqZAo" node="6u6AsDiCjDd" resolve="mbeddrVarName" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="6u6AsDiCjD_" role="37wK5m">
-                    <node concept="1eOMI4" id="6u6AsDiCjDA" role="2Oq$k0">
-                      <node concept="10QFUN" id="6u6AsDiCjDB" role="1eOMHV">
-                        <node concept="3uibUv" id="6u6AsDiCjDC" role="10QFUM">
-                          <ref role="3uigEE" to="x30c:7M6JlBawXh9" resolve="CSimplePointerVariable" />
-                        </node>
-                        <node concept="37vLTw" id="6u6AsDiCjDD" role="10QFUP">
-                          <ref role="3cqZAo" node="6u6AsDiCjDf" resolve="cVariable" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2S8uIT" id="6u6AsDiCjDE" role="2OqNvi">
-                      <ref role="2S8YL0" to="x30c:7M6JlBawXha" resolve="pointingValue" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6u6AsDiCjDP" role="3cqZAp">
-          <node concept="2ShNRf" id="6u6AsDiCjDI" role="3clFbG">
-            <node concept="1pGfFk" id="6u6AsDiCjDJ" role="2ShVmc">
-              <ref role="37wK5l" to="x30c:7M6JlBawWT5" resolve="ComplexMappedVariable" />
-              <node concept="37vLTw" id="6u6AsDiCjDK" role="37wK5m">
-                <ref role="3cqZAo" node="6u6AsDiCjDd" resolve="mbeddrVarName" />
-              </node>
-              <node concept="2OqwBi" id="6u6AsDiCjDL" role="37wK5m">
-                <node concept="37vLTw" id="6u6AsDiCjDM" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6u6AsDiCjDf" resolve="cVariable" />
-                </node>
-                <node concept="2S8uIT" id="6u6AsDiCjDN" role="2OqNvi">
-                  <ref role="2S8YL0" to="x30c:7M6JlBawXgq" resolve="valueRepresentation" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6u6AsDiCjDO" role="37wK5m">
-                <ref role="3cqZAo" node="6u6AsDiCjDj" resolve="pointerValue" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="5Ke7sTqUi7I" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="resolveChildrenDirectly" />
-      <ref role="13i0hy" to="exl8:5Ke7sTqUeE9" resolve="resolveChildrenDirectly" />
-      <node concept="3Tm1VV" id="5Ke7sTqUi7J" role="1B3o_S" />
-      <node concept="3clFbS" id="5Ke7sTqUi7O" role="3clF47">
-        <node concept="3clFbF" id="5Ke7sTqUi_u" role="3cqZAp">
-          <node concept="3clFbT" id="5Ke7sTqUi_t" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="5Ke7sTqUi7P" role="3clF45" />
-    </node>
     <node concept="13i0hz" id="61lw97FtLyl" role="13h7CS">
       <property role="TrG5h" value="getUsedBytes" />
       <property role="13i0it" value="false" />
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps
index 2930be1c1a..8d66532809 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps
@@ -13,7 +13,6 @@
     <import index="u78q" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem.inference(MPS.Core/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="yq40" ref="r:152b3fc0-83a1-4bab-a8cd-565eb8483785(com.mbeddr.core.pointers.structure)" />
-    <import index="2gv2" ref="r:055bac8c-a50b-42ec-a317-e20a256152b4(com.mbeddr.core.debug.structure)" />
     <import index="356a" ref="r:3b7ed80f-6cfd-45bc-b051-2f66c620dd27(jetbrains.mps.lang.traceable.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -438,9 +437,6 @@
     <node concept="PrWs8" id="6ddXmWdKgbL" role="PzmwI">
       <ref role="PrY4T" to="tpee:htgVS9_" resolve="IStatementListContainer" />
     </node>
-    <node concept="PrWs8" id="6ddXmWdKgVj" role="PzmwI">
-      <ref role="PrY4T" to="2gv2:3SnnFeub0mq" resolve="IWatchablesProviderContext" />
-    </node>
     <node concept="PrWs8" id="6NtgknWJ20V" role="PzmwI">
       <ref role="PrY4T" node="2L1k$oXxncW" resolve="IVirtualFlag" />
     </node>
@@ -1416,9 +1412,6 @@
     <node concept="PrWs8" id="4$HG0yY9G74" role="PzmwI">
       <ref role="PrY4T" to="yq40:4$HG0yY9G70" resolve="INullableType" />
     </node>
-    <node concept="PrWs8" id="35tTzla8GLv" role="PzmwI">
-      <ref role="PrY4T" to="2gv2:7oVAz7YD2vL" resolve="IChildrenResolver" />
-    </node>
     <node concept="PrWs8" id="2$xXL4PbjDl" role="PzmwI">
       <ref role="PrY4T" to="c4fa:6IWRcVPT6tl" resolve="ITypeContainingType" />
     </node>
diff --git a/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl b/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl
index dc798a7145..88476659bc 100644
--- a/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl
+++ b/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl
@@ -97,11 +97,8 @@
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-        <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-        <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" version="0" />
@@ -113,7 +110,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
@@ -208,7 +204,6 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
diff --git a/languages/com.mbeddr.cpp.buildconfig/generator/template/main@generator.mps b/languages/com.mbeddr.cpp.buildconfig/generator/template/main@generator.mps
index 6d5a482437..682ff78b46 100644
--- a/languages/com.mbeddr.cpp.buildconfig/generator/template/main@generator.mps
+++ b/languages/com.mbeddr.cpp.buildconfig/generator/template/main@generator.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
-    <use id="223dd778-c44f-4ef3-9535-7aa7d12244a6" name="com.mbeddr.core.debug" version="0" />
     <use id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" name="com.mbeddr.mpsutil.jung" version="0" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
diff --git a/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl b/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl
index 73d1c3056c..57d8811e6c 100644
--- a/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl
+++ b/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl
@@ -82,7 +82,6 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
diff --git a/languages/com.mbeddr.cpp.exceptions/models/behavior.mps b/languages/com.mbeddr.cpp.exceptions/models/behavior.mps
index 6b15730916..39f4413b12 100644
--- a/languages/com.mbeddr.cpp.exceptions/models/behavior.mps
+++ b/languages/com.mbeddr.cpp.exceptions/models/behavior.mps
@@ -8,8 +8,6 @@
   <imports>
     <import index="c4fa" ref="r:9f0e84b6-2ec7-4f9e-83e0-feedc77b63a3(com.mbeddr.core.statements.structure)" />
     <import index="rj8d" ref="r:da9fd96f-5c71-45ab-b2da-1aa6232ec67f(com.mbeddr.core.statements.behavior)" />
-    <import index="2gv2" ref="r:055bac8c-a50b-42ec-a317-e20a256152b4(com.mbeddr.core.debug.structure)" />
-    <import index="exl8" ref="r:9058158e-0926-42f8-8d00-d1d86f1ff722(com.mbeddr.core.debug.behavior)" />
     <import index="zyto" ref="r:50f29036-d138-45ee-9c71-36ae29f9a77a(com.mbeddr.cpp.exceptions.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl b/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl
index 3ca56a40ea..fbd1570304 100644
--- a/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl
+++ b/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl
@@ -105,11 +105,8 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -121,7 +118,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions)</extendedLanguage>
diff --git a/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl b/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl
index 443693b321..5d79dae7ae 100644
--- a/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl
+++ b/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl
@@ -116,11 +116,8 @@
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-        <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-        <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" version="0" />
@@ -132,7 +129,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
         <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-        <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
         <module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
@@ -234,11 +230,8 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -250,7 +243,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>8c081446-e4ba-48b7-a7e0-3db40e2c3439(com.mbeddr.cpp.base)</extendedLanguage>
diff --git a/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl b/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl
index e06b244096..2cf9e20a89 100644
--- a/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl
+++ b/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl
@@ -99,11 +99,8 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -115,7 +112,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</extendedLanguage>
diff --git a/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl b/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl
index 63504e45e0..7f06012048 100644
--- a/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl
+++ b/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl
@@ -93,11 +93,8 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -109,7 +106,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl b/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl
index 129f189a15..bebc65cf2b 100644
--- a/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl
+++ b/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl
@@ -96,11 +96,8 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -112,7 +109,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>8c081446-e4ba-48b7-a7e0-3db40e2c3439(com.mbeddr.cpp.base)</extendedLanguage>
diff --git a/scripts/allScripts.xml b/scripts/allScripts.xml
index 0596bba75a..60f0deb34b 100644
--- a/scripts/allScripts.xml
+++ b/scripts/allScripts.xml
@@ -42,10 +42,6 @@
   <property name="mbeddr.minor.version" value="${import.mbeddr.mbeddr.minor.version}" />
   <property name="mbeddr.build" value="${import.mbeddr.mbeddr.build}" />
   <property name="mbeddr.mbeddr.version" value="${import.mbeddr.mbeddr.mbeddr.version}" />
-  <property name="spawner.major.version" value="${import.mbeddr.spawner.major.version}" />
-  <property name="spawner.minor.version" value="${import.mbeddr.spawner.minor.version}" />
-  <property name="spawner.build" value="${import.mbeddr.spawner.build}" />
-  <property name="spawner.mbeddr.version" value="${import.mbeddr.spawner.mbeddr.version}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
@@ -66,7 +62,7 @@
   
   <target name="assemble" depends="classes, declare-mps-tasks">
     <mkdir dir="${build.layout}" />
-    <echo file="${build.layout}/build.properties">com.mbeddr.cpp.major.version=${major.version}${line.separator}com.mbeddr.cpp.minor.version=${minor.version}${line.separator}com.mbeddr.cpp.build=${build}${line.separator}com.mbeddr.cpp.mbeddr.version=${mbeddr.version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}mbeddr.major.version=${mbeddr.major.version}${line.separator}mbeddr.minor.version=${mbeddr.minor.version}${line.separator}mbeddr.build=${mbeddr.build}${line.separator}mbeddr.mbeddr.version=${mbeddr.mbeddr.version}${line.separator}spawner.major.version=${spawner.major.version}${line.separator}spawner.minor.version=${spawner.minor.version}${line.separator}spawner.build=${spawner.build}${line.separator}spawner.mbeddr.version=${spawner.mbeddr.version}</echo>
+    <echo file="${build.layout}/build.properties">com.mbeddr.cpp.major.version=${major.version}${line.separator}com.mbeddr.cpp.minor.version=${minor.version}${line.separator}com.mbeddr.cpp.build=${build}${line.separator}com.mbeddr.cpp.mbeddr.version=${mbeddr.version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}mbeddr.major.version=${mbeddr.major.version}${line.separator}mbeddr.minor.version=${mbeddr.minor.version}${line.separator}mbeddr.build=${mbeddr.build}${line.separator}mbeddr.mbeddr.version=${mbeddr.mbeddr.version}</echo>
   </target>
   
   <target name="buildDependents" />
diff --git a/solutions/com.mbeddr.cpp.build/models/com.mbeddr.cpp.build.mps b/solutions/com.mbeddr.cpp.build/models/com.mbeddr.cpp.build.mps
index c935ead87f..dd5d558b59 100644
--- a/solutions/com.mbeddr.cpp.build/models/com.mbeddr.cpp.build.mps
+++ b/solutions/com.mbeddr.cpp.build/models/com.mbeddr.cpp.build.mps
@@ -128,6 +128,9 @@
       <concept id="1500819558095907805" name="jetbrains.mps.build.mps.structure.BuildMps_Group" flags="ng" index="2G$12M">
         <child id="1500819558095907806" name="modules" index="2G$12L" />
       </concept>
+      <concept id="8971171305100238972" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyTargetLanguage" flags="ng" index="Rbm2T">
+        <reference id="3189788309731922643" name="language" index="1E1Vl2" />
+      </concept>
       <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
       <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
         <child id="5253498789149547825" name="sources" index="3bR31x" />
@@ -198,9 +201,6 @@
       <node concept="m$_yC" id="4FIECQpWvUB" role="m$_yJ">
         <ref role="m$_y1" to="al5i:7uZw0yZ2_Jq" resolve="com.mbeddr.mpsutil" />
       </node>
-      <node concept="m$_yC" id="4FIECQpWvUC" role="m$_yJ">
-        <ref role="m$_y1" to="p6ld:2coa6Xmdl5V" resolve="com.mbeddr.spawner" />
-      </node>
       <node concept="m$_yC" id="4FIECQpWvUE" role="m$_yJ">
         <ref role="m$_y1" to="al5i:$bJ0jguQdg" resolve="com.mbeddr.platform" />
       </node>
@@ -411,11 +411,6 @@
             <ref role="3bR37D" to="p6ld:7uZw0yZ43LU" resolve="com.mbeddr.core.expressions" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1QWUXETul9N" role="3bR37C">
-          <node concept="3bR9La" id="1QWUXETul9O" role="1SiIV1">
-            <ref role="3bR37D" to="p6ld:7uZw0yZ43K1" resolve="com.mbeddr.core.debug" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="1QWUXETul9P" role="3bR37C">
           <node concept="3bR9La" id="1QWUXETul9Q" role="1SiIV1">
             <ref role="3bR37D" to="p6ld:2W1GNPBwUiB" resolve="com.mbeddr.core.expressions.runtime" />
@@ -442,6 +437,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5GwzVYqzj$r" role="3bR37C">
+          <node concept="3bR9La" id="5GwzVYqzj$s" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4FIECQpNT2_" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -536,6 +536,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5GwzVYqzj$_" role="3bR37C">
+          <node concept="Rbm2T" id="5GwzVYqzj$A" role="1SiIV1">
+            <ref role="1E1Vl2" to="p6ld:7uZw0yZ43LU" resolve="com.mbeddr.core.expressions" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4FIECQpNVu4" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd b/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd
index ad9571ca58..0ecc1867fb 100644
--- a/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd
+++ b/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd
@@ -105,11 +105,8 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
-    <module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -120,7 +117,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="5187f5c9-b8a8-4309-90b3-14f9919bd2d8(jetbrains.mps.refactoring)" version="0" />
-    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="05157886-1175-44aa-8e79-7768b4ab9711(test.ts.com.mbeddr.cpp)" version="0" />
   </dependencyVersions>
 </solution>