diff --git a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.classpath b/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.classpath
deleted file mode 100644
index af1430b..0000000
--- a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.project b/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.project
deleted file mode 100644
index 04e38fb..0000000
--- a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.osbp.dependencies.maven.directdeploy.vaadin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.babel.editor.rbeBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.babel.editor.rbeNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 714351a..0000000
--- a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/pom.xml b/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/pom.xml
deleted file mode 100644
index 01ff958..0000000
--- a/org.eclipse.osbp.dependencies.maven.directdeploy.vaadin/pom.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--#======================================================================= -->
-<!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
-<!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License 2.0  -->
-<!--# which accompanies this distribution, and is available at -->
-<!--# https://www.eclipse.org/legal/epl-2.0/    -->
-<!--#                                           -->
-<!--# SPDX-License-Identifier: EPL-2.0          -->
-<!--# -->
-<!--# Contributors: -->
-<!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
-<!--#======================================================================= -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.eclipse.osbp.dependencies</groupId>
-        <artifactId>org.eclipse.osbp.dependencies-mbp</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>org.eclipse.osbp.dependencies.maven.directdeploy.vaadin</artifactId>
-    <version>0.9.0</version> <!-- no SNAPSHOT, we want to deploy to releases repo -->
-    <packaging>jar</packaging>
-    
-    <repositories>
-        <repository>
-            <id>vaadin-addons</id>
-            <url>http://maven.vaadin.com/vaadin-addons</url>
-        </repository>
-		<repository>
-			<id>atlassian</id>
-			<url>https://maven.atlassian.com/repository/public/</url>
-		</repository>
-    </repositories>
-
-	<dependencies>
-		<dependency>
-		  <groupId>com.oopsconsultancy</groupId>
-		  <artifactId>xmltask</artifactId>
-		  <version>1.16</version>
-		</dependency>
-	</dependencies>
-
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12162 (7.5.7) -->
-								<!-- CQ: missing (7.7.6) -->
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-server</artifactId>
-                                    <version>${vaadin.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12162 (7.5.7) -->
-								<!-- CQ: missing (7.7.6) -->
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-client</artifactId>
-                                    <version>${vaadin.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12162 (7.5.7) -->
-								<!-- CQ: missing (7.7.6) -->
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-client-compiled</artifactId>
-                                    <version>${vaadin.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12079 -->
-								<!-- CQ: missing (7.7.6) -->
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-shared</artifactId>
-                                    <version>${vaadin.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: missing (7.7.6) -->
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-client-compiler</artifactId>
-                                    <version>${vaadin.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12080 (7.5.7) -->
-								<!-- CQ: missing (7.7.6) -->
-                                <artifactItem>
-                                    <groupId>com.vaadin</groupId>
-                                    <artifactId>vaadin-themes</artifactId>
-                                    <version>${vaadin.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12773 -->
-                                <artifactItem>
-                                    <groupId>org.vaadin.addons</groupId>
-                                    <artifactId>vaadin-grid-util</artifactId>
-                                    <version>1.0.7</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12677 -->
-                                <artifactItem>
-                                    <groupId>commons-io</groupId>
-                                    <artifactId>commons-io</artifactId>
-                                    <version>2.4</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: missing -->
-                                <artifactItem>
-                                    <groupId>javax.servlet</groupId>
-                                    <artifactId>servlet-api</artifactId>
-                                    <version>2.5</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12181 -->
-                                <artifactItem>
-                                    <groupId>org.vaadin.addons</groupId>
-                                    <artifactId>contextmenu</artifactId>
-                                    <version>4.2.1</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12183 -->
-                                <artifactItem>
-                                    <groupId>org.vaadin.addons</groupId>
-                                    <artifactId>dragdroplayouts</artifactId>
-                                    <version>1.3.2</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12765 -->
-                                <artifactItem>
-                                    <groupId>org.vaadin.addon</groupId>
-                                    <artifactId>easyuploads</artifactId>
-                                    <version>7.4.2</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>	
-								
-								<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15097 -->
-                                <artifactItem>
-                                    <groupId>com.oopsconsultancy</groupId>
-			                        <artifactId>xmltask</artifactId>
-			                        <version>1.16</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>		
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>jar-deploy-1</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>com.vaadin</groupId>
-                            <artifactId>vaadin-server</artifactId>
-                            <version>${vaadin.version}</version>
-                            <file>${project.build.directory}/vaadin-server-${vaadin.version}.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-2</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>com.vaadin</groupId>
-                            <artifactId>vaadin-client</artifactId>
-                            <version>${vaadin.version}</version>
-                            <file>${project.build.directory}/vaadin-client-${vaadin.version}.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-3</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>com.vaadin</groupId>
-                            <artifactId>vaadin-client-compiled</artifactId>
-                            <version>${vaadin.version}</version>
-                            <file>${project.build.directory}/vaadin-client-compiled-${vaadin.version}.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-4</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>com.vaadin</groupId>
-                            <artifactId>vaadin-shared</artifactId>
-                            <version>${vaadin.version}</version>
-                            <file>${project.build.directory}/vaadin-shared-${vaadin.version}.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-5</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>com.vaadin</groupId>
-                            <artifactId>vaadin-client-compiler</artifactId>
-                            <version>${vaadin.version}</version>
-                            <file>${project.build.directory}/vaadin-client-compiler-${vaadin.version}.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-6</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>com.vaadin</groupId>
-                            <artifactId>vaadin-themes</artifactId>
-                            <version>${vaadin.version}</version>
-                            <file>${project.build.directory}/vaadin-themes-${vaadin.version}.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-7</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>org.vaadin.addons</groupId>
-                            <artifactId>vaadin-grid-util</artifactId>
-                            <version>1.0.7</version>
-                            <file>${project.build.directory}/vaadin-grid-util-1.0.7.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-8</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>commons-io</groupId>
-                            <artifactId>commons-io</artifactId>
-                            <version>2.4</version>
-                            <file>${project.build.directory}/commons-io-2.4.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-9</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>javax.servlet</groupId>
-                            <artifactId>servlet-api</artifactId>
-                            <version>2.5</version>
-                            <file>${project.build.directory}/servlet-api-2.5.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-10</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>org.vaadin.addons</groupId>
-                            <artifactId>contextmenu</artifactId>
-                            <version>4.2.1</version>
-                            <file>${project.build.directory}/contextmenu-4.2.1.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-11</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>org.vaadin.addons</groupId>
-                            <artifactId>dragdroplayouts</artifactId>
-                            <version>1.3.2</version>
-                            <file>${project.build.directory}/dragdroplayouts-1.3.2.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-12</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-                            <groupId>org.vaadin.addon</groupId>
-                            <artifactId>easyuploads</artifactId>
-                            <version>7.4.2</version>
-                            <file>${project.build.directory}/easyuploads-7.4.2.jar</file>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jar-deploy-13</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                            <repositoryId>osbp-nexus-release</repositoryId>
-                            <url>${distribution.repository.release.url}</url>
-							<groupId>com.oopsconsultancy</groupId>
-							<artifactId>xmltask</artifactId>
-							<version>1.16</version>
-                            <file>${project.build.directory}/xmltask-1.16.jar</file>
-                        </configuration>
-                    </execution>
-				</executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
-
diff --git a/pom.xml b/pom.xml
index bffaa31..bb2e215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,6 @@
     </distributionManagement>
 
     <modules>
-        <module>org.eclipse.osbp.dependencies.maven.directdeploy.vaadin</module>
-
         <module>org.eclipse.osbp.dependencies.bundle.activemq.all.osgi</module>
         <module>org.eclipse.osbp.dependencies.bundle.apache.bsf.osgi</module>
         <module>org.eclipse.osbp.dependencies.bundle.commons.vfs.osgi</module>