diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.JunitInterpreterTest/models/org.iets3.core.JunitInterpreterTest.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.JunitInterpreterTest/models/org.iets3.core.JunitInterpreterTest.plugin.mps
index ece93803f..ea0e88b6c 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.JunitInterpreterTest/models/org.iets3.core.JunitInterpreterTest.plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.JunitInterpreterTest/models/org.iets3.core.JunitInterpreterTest.plugin.mps
@@ -78,10 +78,8 @@
     <import index="r791" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.text(JDK/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="9z78" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.border(JDK/)" />
-    <import index="4k19" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.hamcrest(JUnit/)" />
     <import index="cvlm" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.junit.runner(JUnit/)" />
     <import index="k76n" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.junit.runner.notification(JUnit/)" />
-    <import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
     <import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index a8f632444..9d0038751 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -14595,12 +14595,6 @@
       <node concept="m$_yC" id="4iotRn3Ec7C" role="m$_yJ">
         <ref role="m$_y1" node="5wLtKNeSRRD" resolve="org.iets3.core.os" />
       </node>
-      <node concept="m$_yC" id="4iotRn3Ec7F" role="m$_yJ">
-        <ref role="m$_y1" to="90a9:2H_mjOXwfJy" resolve="de.itemis.mps.nativelibs.loader" />
-      </node>
-      <node concept="m$_yC" id="4iotRn3Ec7J" role="m$_yJ">
-        <ref role="m$_y1" node="5Ky8UT4nhy3" resolve="org.iets3.core.expr.genjava" />
-      </node>
     </node>
     <node concept="10PD9b" id="2U5AnekTBPu" role="10PD9s" />
     <node concept="2sgV4H" id="2U5AnekTBPz" role="1l3spa">
@@ -14848,26 +14842,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4iotRn3onKb" role="3bR37C">
-          <node concept="3bR9La" id="4iotRn3onKc" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:3zjMY$95UAa" resolve="jetbrains.mps.core.tool.environment" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4iotRn3onKd" role="3bR37C">
-          <node concept="3bR9La" id="4iotRn3onKe" role="1SiIV1">
-            <ref role="3bR37D" node="26tZ$Z4rphz" resolve="org.iets3.core.expr.genjava.functionalJava" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4iotRn3onKf" role="3bR37C">
-          <node concept="3bR9La" id="4iotRn3onKg" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:2IzUQuFN3dw" resolve="jetbrains.mps.build.mps.runner.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4iotRn3uA6c" role="3bR37C">
-          <node concept="3bR9La" id="4iotRn3uA6d" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:2H_mjOXyaTv" resolve="de.itemis.mps.nativelibs.loader" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="4iotRn3AeWO" role="2G$12L">
         <property role="BnDLt" value="true" />