diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
index e8419d7ddc95bb221f93fecb63a0bea3f32281a7..f12063ae4d7ffaa49bfb23a010fd6d51994c8975 100644
--- a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
@@ -45,7 +45,6 @@
 <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.gmf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.apache.commons.io" version="0.0.0"/>
 <repository location="http://download.eclipse.org/releases/neon/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.classpath b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.classpath
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF
index 3ee39b967ac44d59cfec2c725c9166b4c5adbf6e..9934cba206acb846bf26f480efee2679ab903362 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF
@@ -26,6 +26,7 @@ Require-Bundle: eu.fbk.eclipse.standardtools.utils,
  eu.fbk.tools.editor.oss,
  eu.fbk.eclipse.standardtools.xtextService,
  org.eclipse.xtext,
- eu.fbk.tools.adapter.core
+ eu.fbk.tools.adapter.core,
+ eu.fbk.eclipse.standardtools.diagram
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/build.properties b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/build.properties
index 6f20375d6c7d98fbc80bb5da99be9866b1fe2f73..af2e3af674c182a348909e89c67b7569da750432 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/build.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.xml