diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f65c349c53..6d5e16b2964 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
 Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.
 
+# October 2024
+
+## com.mbeddr.mpsutil.ecore
+
+### Fixed
+
+- Some unncessary dependencies were removed from `com.mbeddr.mpsutil.ecore.stubs`.
+
 # September 2024
 
 * Breaking change: debugger and spawner were not maintained and were removed.
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
index 3ed81f7e8e8..ea42b7b4bcb 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
@@ -1476,34 +1476,6 @@
         <property role="TrG5h" value="test.com.mbeddr.mpsutil.ecore.metaModelImport" />
         <property role="3LESm3" value="5da3f266-d744-4554-a337-854f76f37e5f" />
         <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
-        <node concept="398BVA" id="bHMJKhDAXY" role="3LF7KH">
-          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
-          <node concept="2Ry0Ak" id="bHMJKhDAYF" role="iGT6I">
-            <property role="2Ry0Am" value="tests" />
-            <node concept="2Ry0Ak" id="bHMJKhDD69" role="2Ry0An">
-              <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.ecore.metaModelImport" />
-              <node concept="2Ry0Ak" id="5Ap$XSqW8M_" role="2Ry0An">
-                <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.ecore.metaModelImport.msd" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3rtmxn" id="bHMJKhDD8P" role="3bR31x">
-          <node concept="3LXTmp" id="bHMJKhDD8Q" role="3rtmxm">
-            <node concept="398BVA" id="bHMJKhDD8R" role="3LXTmr">
-              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
-              <node concept="2Ry0Ak" id="bHMJKhDD8S" role="iGT6I">
-                <property role="2Ry0Am" value="tests" />
-                <node concept="2Ry0Ak" id="5Ap$XSqWAMk" role="2Ry0An">
-                  <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.ecore.metaModelImport" />
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="bHMJKhDD8V" role="3LXTna">
-              <property role="3qWCbO" value="icons/**" />
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="bHMJKhDDf5" role="3bR37C">
           <node concept="3bR9La" id="bHMJKhDDf6" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
@@ -1534,6 +1506,34 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
           </node>
         </node>
+        <node concept="398BVA" id="bHMJKhDAXY" role="3LF7KH">
+          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+          <node concept="2Ry0Ak" id="bHMJKhDAYF" role="iGT6I">
+            <property role="2Ry0Am" value="tests" />
+            <node concept="2Ry0Ak" id="bHMJKhDD69" role="2Ry0An">
+              <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.ecore.metaModelImport" />
+              <node concept="2Ry0Ak" id="5Ap$XSqW8M_" role="2Ry0An">
+                <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.ecore.metaModelImport.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="bHMJKhDD8P" role="3bR31x">
+          <node concept="3LXTmp" id="bHMJKhDD8Q" role="3rtmxm">
+            <node concept="398BVA" id="bHMJKhDD8R" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="bHMJKhDD8S" role="iGT6I">
+                <property role="2Ry0Am" value="tests" />
+                <node concept="2Ry0Ak" id="5Ap$XSqWAMk" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.ecore.metaModelImport" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="bHMJKhDD8V" role="3LXTna">
+              <property role="3qWCbO" value="icons/**" />
+            </node>
+          </node>
+        </node>
         <node concept="1BupzO" id="bHMJKhDDfz" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -1980,46 +1980,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4JHJliM0gho" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0ghp" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:776vT$mQZbf" resolve="com.mbeddr.mpsutil.comparator" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JHJliM0ghq" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0ghr" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:vOGyTeLNYF" resolve="com.mbeddr.mpsutil.ecore.testing.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JHJliM0ghs" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0ght" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JHJliM0ghu" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0ghv" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JHJliM0ghw" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0ghx" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:vOGyTeKPEA" resolve="com.mbeddr.mpsutil.ecore.testing" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JHJliM0ghy" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0ghz" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:vOGyTeKpB6" resolve="com.mbeddr.mpsutil.ecore.stubs" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JHJliM0gh$" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0gh_" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:Vtr7jyAKU4" resolve="com.mbeddr.mpsutil.filepicker" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JHJliM0ghA" role="3bR37C">
-          <node concept="3bR9La" id="4JHJliM0ghB" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:vOGyTeKzbV" resolve="com.mbeddr.mpsutil.ecore.runtime" />
-          </node>
-        </node>
         <node concept="1BupzO" id="4JHJliM0ghU" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -2239,6 +2199,11 @@
             <ref role="3bR37D" to="al5i:vOGyTeKpB6" resolve="com.mbeddr.mpsutil.ecore.stubs" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4Ky34TRCBQT" role="3bR37C">
+          <node concept="3bR9La" id="4Ky34TRCBQU" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4_9e_MLhX80" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index e0f1532a8ad..c6b9aeda371 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -1581,25 +1581,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="76lGx$NdVlB" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVlC" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVlq" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVlr" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVls" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVlt" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVlu" role="2Ry0An">
-                      <property role="2Ry0Am" value="com.google.guava-15.0.0.v201403281430.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="76lGx$NdVlQ" role="3bR37C">
           <node concept="1BurEX" id="76lGx$NdVlR" role="1SiIV1">
             <node concept="398BVA" id="76lGx$NdVlD" role="1BurEY">
@@ -1619,25 +1600,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="76lGx$NdVm5" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVm6" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVlS" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVlT" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVlU" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVlV" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVlW" role="2Ry0An">
-                      <property role="2Ry0Am" value="com.ibm.icu-56.1.0.v201601250100.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="76lGx$NdVmk" role="3bR37C">
           <node concept="1BurEX" id="76lGx$NdVml" role="1SiIV1">
             <node concept="398BVA" id="76lGx$NdVm7" role="1BurEY">
@@ -1657,310 +1619,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="76lGx$NdVmz" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVm$" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVmm" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVmn" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVmo" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVmp" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVmq" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.antlr.runtime-3.2.0.v201101311130.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVmM" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVmN" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVm_" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVmA" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVmB" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVmC" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVmD" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.apache.commons.cli-1.2.0.v201404270220.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVn1" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVn2" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVmO" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVmP" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVmQ" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVmR" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVmS" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.apache.commons.lang-2.6.0.v201404270220.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVng" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVnh" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVn3" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVn4" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVn5" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVn6" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVn7" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.apache.commons.logging-1.1.1.v201101211721.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVnI" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVnJ" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVnx" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVny" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVnz" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVn$" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVn_" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.commands-3.8.0.v20160316-1921.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVnX" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVnY" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVnK" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVnL" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVnM" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVnN" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVnO" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVoc" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVod" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVnZ" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVo0" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVo1" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVo2" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVo3" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.expressions-3.5.100.v20160418-1621.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVor" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVos" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVoe" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVof" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVog" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVoh" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVoi" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVoE" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVoF" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVot" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVou" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVov" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVow" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVox" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.jobs-3.8.0.v20160509-0411.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVoT" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVoU" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVoG" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVoH" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVoI" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVoJ" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVoK" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.resources-3.11.0.v20160503-1608.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVp8" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVp9" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVoV" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVoW" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVoX" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVoY" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVoZ" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.runtime-3.12.0.v20160606-1342.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVpn" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVpo" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVpa" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVpb" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVpc" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVpd" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVpe" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.core.variables-3.3.0.v20160419-1720.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVpA" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVpB" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVpp" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVpq" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVpr" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVps" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVpt" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.debug.core-3.10.100.v20160419-1720.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVpP" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVpQ" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVpC" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVpD" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVpE" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVpF" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVpG" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVq4" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVq5" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVpR" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVpS" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVpT" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVpU" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVpV" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVqj" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVqk" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVq6" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVq7" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVq8" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVq9" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVqa" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="76lGx$NdVqJ" role="3bR37C">
           <node concept="1BurEX" id="76lGx$NdVqK" role="1SiIV1">
             <node concept="398BVA" id="76lGx$NdVqy" role="1BurEY">
@@ -1999,101 +1657,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="76lGx$NdVrB" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVrC" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVrq" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVrr" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVrs" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVrt" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVru" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVrQ" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVrR" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVrD" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVrE" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVrF" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVrG" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVrH" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVs5" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVs6" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVrS" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVrT" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVrU" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVrV" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVrW" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVsk" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVsl" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVs7" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVs8" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVs9" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVsa" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVsb" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVsz" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVs$" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVsm" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVsn" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVso" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVsp" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVsq" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.equinox.app-1.3.400.v20150715-1528.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="76lGx$NdVsM" role="3bR37C">
           <node concept="1BurEX" id="76lGx$NdVsN" role="1SiIV1">
             <node concept="398BVA" id="76lGx$NdVs_" role="1BurEY">
@@ -2113,234 +1676,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="76lGx$NdVt1" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVt2" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVsO" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVsP" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVsQ" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVsR" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVsS" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVtg" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVth" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVt3" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVt4" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVt5" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVt6" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVt7" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVtv" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVtw" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVti" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVtj" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVtk" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVtl" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVtm" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.jdt.core-3.12.0.v20160516-2131.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVtI" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVtJ" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVtx" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVty" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVtz" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVt$" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVt_" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVtX" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVtY" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVtK" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVtL" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVtM" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVtN" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVtO" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVuc" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVud" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVtZ" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVu0" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVu1" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVu2" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVu3" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVur" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVus" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVue" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVuf" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVug" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVuh" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVui" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.osgi-3.11.0.v20160603-1336.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVuE" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVuF" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVut" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVuu" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVuv" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVuw" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVux" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.text-3.6.0.v20160503-1849.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVuT" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVuU" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVuG" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVuH" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVuI" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVuJ" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVuK" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.xtend-2.2.0.v201605260315.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVv8" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVv9" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVuV" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVuW" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVuX" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVuY" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVuZ" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVvn" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVvo" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVva" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVvb" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVvc" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVvd" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVve" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="76lGx$NdVvA" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVvB" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVvp" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVvq" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVvr" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVvs" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVvt" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="76lGx$NdVvP" role="3bR37C">
           <node concept="1BurEX" id="76lGx$NdVvQ" role="1SiIV1">
             <node concept="398BVA" id="76lGx$NdVvC" role="1BurEY">
@@ -2455,25 +1790,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="76lGx$NdVxf" role="3bR37C">
-          <node concept="1BurEX" id="76lGx$NdVxg" role="1SiIV1">
-            <node concept="398BVA" id="76lGx$NdVx2" role="1BurEY">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="76lGx$NdVx3" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="76lGx$NdVx4" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.ecoretransformationutils.stubs" />
-                  <node concept="2Ry0Ak" id="76lGx$NdVx5" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="76lGx$NdVx6" role="2Ry0An">
-                      <property role="2Ry0Am" value="org.objectweb.asm-5.0.1.v201404251740.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1BupzO" id="4PRpvcZJN7E" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -2496,6 +1812,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="46XBvPMFwgD" role="3bR37C">
+          <node concept="3bR9La" id="46XBvPMFwgE" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="vOGyTeKzbV" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2941,11 +2263,6 @@
             <ref role="3bR37D" node="vOGyTeKpB6" resolve="com.mbeddr.mpsutil.ecore.stubs" />
           </node>
         </node>
-        <node concept="1SiIV0" id="79jc6Yzk23i" role="3bR37C">
-          <node concept="3bR9La" id="79jc6Yzk23j" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
-          </node>
-        </node>
         <node concept="1BupzO" id="4PRpvcZJN9g" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps
index bae02cbbe2f..9c65caefb58 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps
@@ -13417,8 +13417,8 @@
     <property role="1EXbeo" value="false" />
     <property role="3GE5qa" value="common" />
     <node concept="3Tm1VV" id="1Ur9vEMLygD" role="1B3o_S" />
-    <node concept="3uibUv" id="1Ur9vEMLygE" role="1zkMxy">
-      <ref role="3uigEE" to="elak:~XcoreStandaloneSetup$XcoreStandaloneRuntimeModule$XcoreResourceSetInitializer" resolve="XcoreStandaloneSetup.XcoreStandaloneRuntimeModule.XcoreResourceSetInitializer" />
+    <node concept="3uibUv" id="6Yk8MIpf76j" role="1zkMxy">
+      <ref role="3uigEE" to="elak:~XcoreStandaloneSetup$XcoreStandaloneRuntimeModule$XcoreResourceSetInitializer" resolve="XcoreResourceSetInitializer" />
     </node>
     <node concept="312cEg" id="1Ur9vEMLygF" role="jymVt">
       <property role="34CwA1" value="false" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd
index d2ae6ca21d9..3e5c432b0a0 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd
@@ -1,60 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="com.mbeddr.mpsutil.ecore.stubs" uuid="822a7acd-f487-45f5-bbb9-1ce595a1705f" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}" type="java_classes">
-      <sourceRoot location="lib/com.google.guava-15.0.0.v201403281430.jar" />
+    <modelRoot type="java_classes" contentPath="${module}">
       <sourceRoot location="lib/com.google.inject-3.0.0.v201605172100.jar" />
-      <sourceRoot location="lib/com.ibm.icu-56.1.0.v201601250100.jar" />
       <sourceRoot location="lib/javax.inject-1.0.0.v20091030.jar" />
-      <sourceRoot location="lib/org.antlr.runtime-3.2.0.v201101311130.jar" />
-      <sourceRoot location="lib/org.apache.commons.cli-1.2.0.v201404270220.jar" />
-      <sourceRoot location="lib/org.apache.commons.lang-2.6.0.v201404270220.jar" />
-      <sourceRoot location="lib/org.apache.commons.logging-1.1.1.v201101211721.jar" />
-      <sourceRoot location="lib/org.eclipse.core.commands-3.8.0.v20160316-1921.jar" />
-      <sourceRoot location="lib/org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar" />
-      <sourceRoot location="lib/org.eclipse.core.expressions-3.5.100.v20160418-1621.jar" />
-      <sourceRoot location="lib/org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar" />
-      <sourceRoot location="lib/org.eclipse.core.jobs-3.8.0.v20160509-0411.jar" />
-      <sourceRoot location="lib/org.eclipse.core.resources-3.11.0.v20160503-1608.jar" />
-      <sourceRoot location="lib/org.eclipse.core.runtime-3.12.0.v20160606-1342.jar" />
-      <sourceRoot location="lib/org.eclipse.core.variables-3.3.0.v20160419-1720.jar" />
-      <sourceRoot location="lib/org.eclipse.debug.core-3.10.100.v20160419-1720.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar" />
       <sourceRoot location="lib/org.eclipse.emf.common_2.10.1.v20150123-0348.jar" />
       <sourceRoot location="lib/org.eclipse.emf.ecore.xcore-1.4.0.v20160526-0606.jar" />
       <sourceRoot location="lib/org.eclipse.emf.ecore.xcore.lib-1.1.100.v20160526-0606.jar" />
       <sourceRoot location="lib/org.eclipse.emf.ecore.xmi_2.10.2.v20150123-0348.jar" />
       <sourceRoot location="lib/org.eclipse.emf.ecore_2.10.2.v20150123-0348.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar" />
-      <sourceRoot location="lib/org.eclipse.equinox.app-1.3.400.v20150715-1528.jar" />
       <sourceRoot location="lib/org.eclipse.equinox.common-3.8.0.v20160509-1230.jar" />
-      <sourceRoot location="lib/org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar" />
-      <sourceRoot location="lib/org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar" />
-      <sourceRoot location="lib/org.eclipse.jdt.core-3.12.0.v20160516-2131.jar" />
-      <sourceRoot location="lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar" />
-      <sourceRoot location="lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar" />
-      <sourceRoot location="lib/org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar" />
-      <sourceRoot location="lib/org.eclipse.osgi-3.11.0.v20160603-1336.jar" />
-      <sourceRoot location="lib/org.eclipse.text-3.6.0.v20160503-1849.jar" />
-      <sourceRoot location="lib/org.eclipse.xtend-2.2.0.v201605260315.jar" />
-      <sourceRoot location="lib/org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar" />
-      <sourceRoot location="lib/org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar" />
-      <sourceRoot location="lib/org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar" />
       <sourceRoot location="lib/org.eclipse.xtext-2.11.0.v20170130-0808.jar" />
       <sourceRoot location="lib/org.eclipse.xtext.common.types-2.11.0.v20170131-1210.jar" />
       <sourceRoot location="lib/org.eclipse.xtext.ecore-2.11.0.v20170131-1210.jar" />
       <sourceRoot location="lib/org.eclipse.xtext.util-2.11.0.v20170130-0808.jar" />
       <sourceRoot location="lib/org.eclipse.xtext.xbase-2.11.0.v20170131-1210.jar" />
       <sourceRoot location="lib/org.eclipse.xtext.xbase.lib-2.11.0.v20170124-1424.jar" />
-      <sourceRoot location="lib/org.objectweb.asm-5.0.1.v201404251740.jar" />
     </modelRoot>
   </models>
   <facets>
@@ -63,60 +27,25 @@
     </facet>
   </facets>
   <stubModelEntries>
-    <stubModelEntry path="${module}/lib/com.google.guava-15.0.0.v201403281430.jar" />
     <stubModelEntry path="${module}/lib/com.google.inject-3.0.0.v201605172100.jar" />
-    <stubModelEntry path="${module}/lib/com.ibm.icu-56.1.0.v201601250100.jar" />
     <stubModelEntry path="${module}/lib/javax.inject-1.0.0.v20091030.jar" />
-    <stubModelEntry path="${module}/lib/org.antlr.runtime-3.2.0.v201101311130.jar" />
-    <stubModelEntry path="${module}/lib/org.apache.commons.cli-1.2.0.v201404270220.jar" />
-    <stubModelEntry path="${module}/lib/org.apache.commons.lang-2.6.0.v201404270220.jar" />
-    <stubModelEntry path="${module}/lib/org.apache.commons.logging-1.1.1.v201101211721.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.commands-3.8.0.v20160316-1921.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.expressions-3.5.100.v20160418-1621.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.jobs-3.8.0.v20160509-0411.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.resources-3.11.0.v20160503-1608.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.runtime-3.12.0.v20160606-1342.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.core.variables-3.3.0.v20160419-1720.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.debug.core-3.10.100.v20160419-1720.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.emf.common_2.10.1.v20150123-0348.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xcore-1.4.0.v20160526-0606.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xcore.lib-1.1.100.v20160526-0606.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xmi_2.10.2.v20150123-0348.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore_2.10.2.v20150123-0348.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.equinox.app-1.3.400.v20150715-1528.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.equinox.common-3.8.0.v20160509-1230.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.core-3.12.0.v20160516-2131.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.osgi-3.11.0.v20160603-1336.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.text-3.6.0.v20160503-1849.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend-2.2.0.v201605260315.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.xtext-2.11.0.v20170130-0808.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.xtext.common.types-2.11.0.v20170131-1210.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.xtext.ecore-2.11.0.v20170131-1210.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.xtext.util-2.11.0.v20170130-0808.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.xtext.xbase-2.11.0.v20170131-1210.jar" />
     <stubModelEntry path="${module}/lib/org.eclipse.xtext.xbase.lib-2.11.0.v20170124-1424.jar" />
-    <stubModelEntry path="${module}/lib/org.objectweb.asm-5.0.1.v201404251740.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -125,7 +54,9 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="822a7acd-f487-45f5-bbb9-1ce595a1705f(com.mbeddr.mpsutil.ecore.stubs)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/com.google.guava-15.0.0.v201403281430.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/com.google.guava-15.0.0.v201403281430.jar
deleted file mode 100644
index 85bfe9a1c53..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/com.google.guava-15.0.0.v201403281430.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/com.ibm.icu-56.1.0.v201601250100.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/com.ibm.icu-56.1.0.v201601250100.jar
deleted file mode 100644
index 8fc9c9361c0..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/com.ibm.icu-56.1.0.v201601250100.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.antlr.runtime-3.2.0.v201101311130.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.antlr.runtime-3.2.0.v201101311130.jar
deleted file mode 100644
index 11845281a3d..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.antlr.runtime-3.2.0.v201101311130.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.cli-1.2.0.v201404270220.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.cli-1.2.0.v201404270220.jar
deleted file mode 100644
index 8d919eef945..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.cli-1.2.0.v201404270220.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.lang-2.6.0.v201404270220.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.lang-2.6.0.v201404270220.jar
deleted file mode 100644
index 9f1c912afe6..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.lang-2.6.0.v201404270220.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.logging-1.1.1.v201101211721.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.logging-1.1.1.v201101211721.jar
deleted file mode 100644
index e1df73151e1..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.apache.commons.logging-1.1.1.v201101211721.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.commands-3.8.0.v20160316-1921.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.commands-3.8.0.v20160316-1921.jar
deleted file mode 100644
index ecf816f8ec5..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.commands-3.8.0.v20160316-1921.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar
deleted file mode 100644
index c192f633079..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.contenttype-3.5.100.v20160418-1621.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.expressions-3.5.100.v20160418-1621.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.expressions-3.5.100.v20160418-1621.jar
deleted file mode 100644
index 363c017b729..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.expressions-3.5.100.v20160418-1621.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar
deleted file mode 100644
index bdbefd8c53b..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.filesystem-1.6.0.v20160503-1608.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.jobs-3.8.0.v20160509-0411.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.jobs-3.8.0.v20160509-0411.jar
deleted file mode 100644
index 8bc8cfee1f2..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.jobs-3.8.0.v20160509-0411.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.resources-3.11.0.v20160503-1608.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.resources-3.11.0.v20160503-1608.jar
deleted file mode 100644
index 11e64a38c8b..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.resources-3.11.0.v20160503-1608.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.runtime-3.12.0.v20160606-1342.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.runtime-3.12.0.v20160606-1342.jar
deleted file mode 100644
index 938f7c81756..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.runtime-3.12.0.v20160606-1342.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.variables-3.3.0.v20160419-1720.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.variables-3.3.0.v20160419-1720.jar
deleted file mode 100644
index 14ef54aea24..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.core.variables-3.3.0.v20160419-1720.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.debug.core-3.10.100.v20160419-1720.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.debug.core-3.10.100.v20160419-1720.jar
deleted file mode 100644
index 82ffbef0f74..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.debug.core-3.10.100.v20160419-1720.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar
deleted file mode 100644
index 9295602d2e4..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen-2.11.0.v20160526-0356.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar
deleted file mode 100644
index 8cbccf2ecb7..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen.ecore-2.12.0.v20160526-0356.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar
deleted file mode 100644
index 03751dbde24..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.codegen.ecore.xtext-1.2.0.v20160526-0606.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar
deleted file mode 100644
index d70331b338b..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe.core-1.3.20.v201605261103.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar
deleted file mode 100644
index 4241190db2c..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe.utils-1.3.20.v201605261103.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar
deleted file mode 100644
index cfb7722fce8..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe2.lib-2.9.0.v201605261103.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar
deleted file mode 100644
index 093a385dfb5..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.emf.mwe2.runtime-2.9.0.v201605261103.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.app-1.3.400.v20150715-1528.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.app-1.3.400.v20150715-1528.jar
deleted file mode 100644
index ddd85e1ef1a..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.app-1.3.400.v20150715-1528.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar
deleted file mode 100644
index df7b498cca3..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.preferences-3.6.0.v20160120-1756.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar
deleted file mode 100644
index 0a01fb6b4d3..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.equinox.registry-3.6.100.v20160223-2218.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.core-3.12.0.v20160516-2131.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.core-3.12.0.v20160516-2131.jar
deleted file mode 100644
index 3021a4e9b70..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.core-3.12.0.v20160516-2131.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar
deleted file mode 100644
index cf9d79be20e..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdi.jar.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar
deleted file mode 100644
index 7edea5e0cb9..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.debug-3.10.0.v20160418-1524-jdimodel.jar.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar
deleted file mode 100644
index 8a6faa7901a..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.jdt.launching-3.8.100.v20160505-0636.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.osgi-3.11.0.v20160603-1336.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.osgi-3.11.0.v20160603-1336.jar
deleted file mode 100644
index 644050e7735..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.osgi-3.11.0.v20160603-1336.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.text-3.6.0.v20160503-1849.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.text-3.6.0.v20160503-1849.jar
deleted file mode 100644
index 64bfce25a5d..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.text-3.6.0.v20160503-1849.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend-2.2.0.v201605260315.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend-2.2.0.v201605260315.jar
deleted file mode 100644
index af182367466..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend-2.2.0.v201605260315.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar
deleted file mode 100644
index 0a3d47c4881..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.lib-2.11.0.v20170124-1424.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar
deleted file mode 100644
index 1553b1d0a75..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.lib.macro-2.11.0.v20170124-1424.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar
deleted file mode 100644
index aef36b9e1ef..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.eclipse.xtend.typesystem.emf-2.2.0.v201605260315.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.objectweb.asm-5.0.1.v201404251740.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.objectweb.asm-5.0.1.v201404251740.jar
deleted file mode 100644
index be9b351e8d4..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/org.objectweb.asm-5.0.1.v201404251740.jar and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps
index 45942f5e353..6b7c2674fcd 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps
@@ -14,10 +14,8 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="gtp9" ref="r:007d0985-20e2-4d70-80f1-d0de1aff1076(com.mbeddr.mpsutil.common.graph)" />
-    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="xlxw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.math(JDK/)" />
-    <import index="cfsy" ref="822a7acd-f487-45f5-bbb9-1ce595a1705f/java:org.apache.commons.lang.mutable(com.mbeddr.mpsutil.ecore.stubs/)" />
     <import index="3o3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.google.common.collect(MPS.IDEA/)" />
+    <import index="qhup" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3.mutable(org.apache.commons/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -242,11 +240,11 @@
             <node concept="3cpWsn" id="9jWrhFjvJ0" role="3cpWs9">
               <property role="TrG5h" value="expensiveCount" />
               <node concept="3uibUv" id="9jWrhFjvJ1" role="1tU5fm">
-                <ref role="3uigEE" to="cfsy:~MutableInt" resolve="MutableInt" />
+                <ref role="3uigEE" to="qhup:~MutableInt" resolve="MutableInt" />
               </node>
               <node concept="2ShNRf" id="9jWrhFjvK6" role="33vP2m">
                 <node concept="1pGfFk" id="9jWrhFjvJX" role="2ShVmc">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.&lt;init&gt;(int)" resolve="MutableInt" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.&lt;init&gt;(int)" resolve="MutableInt" />
                   <node concept="3cmrfG" id="9jWrhFjvKE" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -293,7 +291,7 @@
                           <ref role="3cqZAo" node="9jWrhFjvJ0" resolve="expensiveCount" />
                         </node>
                         <node concept="liA8E" id="9jWrhFjUDf" role="2OqNvi">
-                          <ref role="37wK5l" to="cfsy:~MutableInt.increment()" resolve="increment" />
+                          <ref role="37wK5l" to="qhup:~MutableInt.increment()" resolve="increment" />
                         </node>
                       </node>
                     </node>
@@ -387,7 +385,7 @@
                   <ref role="3cqZAo" node="9jWrhFjvJ0" resolve="expensiveCount" />
                 </node>
                 <node concept="liA8E" id="9jWrhFl2mE" role="2OqNvi">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.getValue()" resolve="getValue" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.getValue()" resolve="getValue" />
                 </node>
               </node>
             </node>
@@ -475,7 +473,7 @@
                   <ref role="3cqZAo" node="9jWrhFjvJ0" resolve="expensiveCount" />
                 </node>
                 <node concept="liA8E" id="9jWrhFkOYI" role="2OqNvi">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.getValue()" resolve="getValue" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.getValue()" resolve="getValue" />
                 </node>
               </node>
             </node>
@@ -498,11 +496,11 @@
             <node concept="3cpWsn" id="9jWrhFl41r" role="3cpWs9">
               <property role="TrG5h" value="expensiveCount" />
               <node concept="3uibUv" id="9jWrhFl41s" role="1tU5fm">
-                <ref role="3uigEE" to="cfsy:~MutableInt" resolve="MutableInt" />
+                <ref role="3uigEE" to="qhup:~MutableInt" resolve="MutableInt" />
               </node>
               <node concept="2ShNRf" id="9jWrhFl41t" role="33vP2m">
                 <node concept="1pGfFk" id="9jWrhFl41u" role="2ShVmc">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.&lt;init&gt;(int)" resolve="MutableInt" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.&lt;init&gt;(int)" resolve="MutableInt" />
                   <node concept="3cmrfG" id="9jWrhFl41v" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -514,11 +512,11 @@
             <node concept="3cpWsn" id="9jWrhFl5iH" role="3cpWs9">
               <property role="TrG5h" value="m" />
               <node concept="3uibUv" id="9jWrhFl5iI" role="1tU5fm">
-                <ref role="3uigEE" to="cfsy:~MutableInt" resolve="MutableInt" />
+                <ref role="3uigEE" to="qhup:~MutableInt" resolve="MutableInt" />
               </node>
               <node concept="2ShNRf" id="9jWrhFl5Ea" role="33vP2m">
                 <node concept="1pGfFk" id="9jWrhFl5E1" role="2ShVmc">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.&lt;init&gt;(int)" resolve="MutableInt" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.&lt;init&gt;(int)" resolve="MutableInt" />
                   <node concept="3cmrfG" id="9jWrhFla4D" role="37wK5m">
                     <property role="3cmrfH" value="77" />
                   </node>
@@ -565,7 +563,7 @@
                           <ref role="3cqZAo" node="9jWrhFl41r" resolve="expensiveCount" />
                         </node>
                         <node concept="liA8E" id="9jWrhFl41L" role="2OqNvi">
-                          <ref role="37wK5l" to="cfsy:~MutableInt.increment()" resolve="increment" />
+                          <ref role="37wK5l" to="qhup:~MutableInt.increment()" resolve="increment" />
                         </node>
                       </node>
                     </node>
@@ -580,7 +578,7 @@
                   <node concept="37vLTG" id="9jWrhFl79Q" role="1bW2Oz">
                     <property role="TrG5h" value="m" />
                     <node concept="3uibUv" id="9jWrhFl7A$" role="1tU5fm">
-                      <ref role="3uigEE" to="cfsy:~MutableInt" resolve="MutableInt" />
+                      <ref role="3uigEE" to="qhup:~MutableInt" resolve="MutableInt" />
                     </node>
                   </node>
                   <node concept="3clFbS" id="9jWrhFl73g" role="1bW5cS">
@@ -633,7 +631,7 @@
                             <ref role="3cqZAo" node="9jWrhFl79Q" resolve="m" />
                           </node>
                           <node concept="liA8E" id="9jWrhFl9tj" role="2OqNvi">
-                            <ref role="37wK5l" to="cfsy:~MutableInt.getValue()" resolve="getValue" />
+                            <ref role="37wK5l" to="qhup:~MutableInt.getValue()" resolve="getValue" />
                           </node>
                         </node>
                       </node>
@@ -727,7 +725,7 @@
                   <ref role="3cqZAo" node="9jWrhFl41r" resolve="expensiveCount" />
                 </node>
                 <node concept="liA8E" id="9jWrhFl42k" role="2OqNvi">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.getValue()" resolve="getValue" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.getValue()" resolve="getValue" />
                 </node>
               </node>
             </node>
@@ -819,7 +817,7 @@
                   <ref role="3cqZAo" node="9jWrhFl41r" resolve="expensiveCount" />
                 </node>
                 <node concept="liA8E" id="9jWrhFl42Q" role="2OqNvi">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.getValue()" resolve="getValue" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.getValue()" resolve="getValue" />
                 </node>
               </node>
             </node>
@@ -883,7 +881,7 @@
                 <ref role="3cqZAo" node="9jWrhFl5iH" resolve="m" />
               </node>
               <node concept="liA8E" id="9jWrhFlbnC" role="2OqNvi">
-                <ref role="37wK5l" to="cfsy:~MutableInt.increment()" resolve="increment" />
+                <ref role="37wK5l" to="qhup:~MutableInt.increment()" resolve="increment" />
               </node>
             </node>
           </node>
@@ -921,7 +919,7 @@
                   <ref role="3cqZAo" node="9jWrhFl41r" resolve="expensiveCount" />
                 </node>
                 <node concept="liA8E" id="9jWrhFlbJY" role="2OqNvi">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.getValue()" resolve="getValue" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.getValue()" resolve="getValue" />
                 </node>
               </node>
             </node>
@@ -1004,7 +1002,7 @@
                   <ref role="3cqZAo" node="9jWrhFl41r" resolve="expensiveCount" />
                 </node>
                 <node concept="liA8E" id="9jWrhFldb9" role="2OqNvi">
-                  <ref role="37wK5l" to="cfsy:~MutableInt.getValue()" resolve="getValue" />
+                  <ref role="37wK5l" to="qhup:~MutableInt.getValue()" resolve="getValue" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd
index c4515a382b3..c5f27217155 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd
@@ -16,6 +16,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">822a7acd-f487-45f5-bbb9-1ce595a1705f(com.mbeddr.mpsutil.ecore.stubs)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
+    <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -36,6 +37,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
     <module reference="822a7acd-f487-45f5-bbb9-1ce595a1705f(com.mbeddr.mpsutil.ecore.stubs)" version="0" />
+    <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
     <module reference="fceddec6-7184-49a0-9009-0da4dbdc8b95(test.com.mbeddr.mpsutil.common)" version="0" />
   </dependencyVersions>
 </solution>