diff --git a/build.gradle b/build.gradle
index 5d86ba0c8..2cf39533a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -165,58 +165,32 @@ task copyModelApi() {
 
 configurations {
     ant_lib
-    diagram_lib
+    diagram_lib {
+        exclude(group: 'com.google.guava')
+        attributes.attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm')
+    }
 }
 
 dependencies {
     ant_lib "org.apache.ant:ant-junit:1.10.14"
 
     def elkVersion = "0.9.1"
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.common:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.layered:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.mrtree:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.radial:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.force:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.disco:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.rectpacking:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.spore:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.topdownpacking:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.30.0") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.36.0") {
-        transitive = false
-    }
-    diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.37.0") {
-        transitive = false
-    }
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.common:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.layered:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.mrtree:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.radial:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.force:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.disco:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.rectpacking:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.spore:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.topdownpacking:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion")
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion")
+    diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.30.0")
+    diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.36.0")
+    diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.37.0")
 }
 
-configurations.diagram_lib.attributes.attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm')
 
 ext.buildScriptClasspath = project.configurations.ant_lib.fileCollection({
     true
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/.gitignore b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/.gitignore
new file mode 100644
index 000000000..4bbfc808c
--- /dev/null
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/.gitignore
@@ -0,0 +1,2 @@
+*
+!jgraphx.jar
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.common.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.common.jar
deleted file mode 100644
index 389d4916f..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.common.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.disco.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.disco.jar
deleted file mode 100644
index ed622c400..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.disco.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.force.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.force.jar
deleted file mode 100644
index 7b28e0417..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.force.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.layered.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.layered.jar
deleted file mode 100644
index 70012bc03..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.layered.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.mrtree.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.mrtree.jar
deleted file mode 100644
index 95c4a61f7..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.mrtree.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.radial.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.radial.jar
deleted file mode 100644
index 2c73cd812..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.radial.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.rectpacking.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.rectpacking.jar
deleted file mode 100644
index a5f964a0c..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.rectpacking.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.spore.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.spore.jar
deleted file mode 100644
index b3c8028c5..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.spore.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.topdownpacking.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.topdownpacking.jar
deleted file mode 100644
index 97ae59ed6..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.alg.topdownpacking.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.core.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.core.jar
deleted file mode 100644
index d1c1a55c4..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.core.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.graph.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.graph.jar
deleted file mode 100644
index 204009830..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.elk.graph.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.common.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.common.jar
deleted file mode 100644
index 808330b1f..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.common.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.ecore.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.ecore.jar
deleted file mode 100644
index f1c1ed2fe..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.ecore.jar and /dev/null differ
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.ecore.xmi.jar b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.ecore.xmi.jar
deleted file mode 100644
index affc672e2..000000000
Binary files a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib/org.eclipse.emf.ecore.xmi.jar and /dev/null differ