diff --git a/java/com.sap.sailing.server/SailingServer (Proxy).launch b/java/com.sap.sailing.server/SailingServer (Proxy).launch
index faea7a6c9f3..c0b5ac9942b 100644
--- a/java/com.sap.sailing.server/SailingServer (Proxy).launch	
+++ b/java/com.sap.sailing.server/SailingServer (Proxy).launch	
@@ -29,7 +29,7 @@
 <stringAttribute key="profilingTraceType-PERFORMANCE_HOTSPOT_TRACE" value="KEY_IGNORE_SLEEPING_THREADS%CTX_KEY%true%CTX_ENTRY%KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
 <stringAttribute key="profilingTraceType-SYNCHRONIZATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.rabbitmq.client@default:default,com.sun.jersey@default:default,com.sun.mail.javax.mail@default:default,javax.servlet@default:default,javax.validation@default:default,javax.ws.rs@default:default,jcl.over.slf4j@default:default,org.apache.activemq.activeio-core@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.commons.codec@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.geronimo.specs.geronimo-annotation_1.0_spec@default:default,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.boot@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.jdom@default:default,org.objectweb.asm@default:default,rome@default:default,routeconverter@default:default,slf4j.api@default:default,slf4j.jdk14@default:false"/>
+<stringAttribute key="target_bundles" value="com.rabbitmq.client@default:default,com.sun.jersey@default:default,com.sun.mail.javax.mail@default:default,javax.servlet@default:default,javax.validation@default:default,javax.ws.rs@default:default,jcl.over.slf4j@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.geronimo.specs.geronimo-annotation_1.0_spec@default:default,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.boot@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.jdom@default:default,org.objectweb.asm@default:default,rome@default:default,routeconverter@default:default,slf4j.api@default:default,slf4j.jdk14@default:false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="false"/>
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
index 07310674353..b50560fc6cf 100755
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
@@ -56,6 +56,10 @@
 <unit id="org.apache.felix.gogo.runtime.source" version="0.10.0.v201209301036"/>
 <unit id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>
 <unit id="org.apache.felix.gogo.shell.source" version="0.10.0.v201212101605"/>
+<unit id="org.apache.commons.collections" version="3.2.0.v2013030210310"/>
+<unit id="org.apache.commons.collections.source" version="3.2.0.v2013030210310"/>
+<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
+<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
 <repository location="http://download.eclipse.org/releases/luna"/>
 </location>
 </locations>
@@ -74,10 +78,11 @@
 <plugin id="javax.ws.rs.source"/>
 <plugin id="jcl.over.slf4j"/>
 <plugin id="jul.to.slf4j"/>
-<plugin id="org.apache.activemq.activeio-core"/>
-<plugin id="org.apache.activemq.activemq-core"/>
-<plugin id="org.apache.activemq.kahadb"/>
+<plugin id="org.apache.commons.beanutils"/>
+<plugin id="org.apache.commons.beanutils.source"/>
 <plugin id="org.apache.commons.codec"/>
+<plugin id="org.apache.commons.collections"/>
+<plugin id="org.apache.commons.collections.source"/>
 <plugin id="org.apache.commons.fileupload"/>
 <plugin id="org.apache.commons.fileupload.source"/>
 <plugin id="org.apache.commons.io"/>
diff --git a/java/com.sap.sse.security/.classpath b/java/com.sap.sse.security/.classpath
index a3007a23a5e..e21bfe8c04c 100644
--- a/java/com.sap.sse.security/.classpath
+++ b/java/com.sap.sse.security/.classpath
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-1.7.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/shiro-core-1.2.2.jar" sourcepath="C:/Users/D056866/Downloads/shiro-root-1.2.2-source-release.zip"/>
 	<classpathentry exported="true" kind="lib" path="lib/shiro-web-1.2.2.jar" sourcepath="C:/Users/D056866/Downloads/shiro-root-1.2.2-source-release.zip"/>
 	<classpathentry exported="true" kind="lib" path="lib/shiro-ehcache-1.2.3.jar"/>
@@ -14,6 +9,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="resources"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.apache.servicemix.bundles.scribe-1.3.3_1.jar" sourcepath="C:/Users/D056866/Sailing/scribe-java-master/src"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/com.sap.sse.security/META-INF/MANIFEST.MF b/java/com.sap.sse.security/META-INF/MANIFEST.MF
index 5caecce528a..9038be045fa 100644
--- a/java/com.sap.sse.security/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security/META-INF/MANIFEST.MF
@@ -14,22 +14,18 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: lib/shiro-core-1.2.2.jar,
  lib/shiro-web-1.2.2.jar,
  .,
- lib/commons-beanutils-1.9.0.jar,
- lib/commons-logging-1.1.3.jar,
- lib/commons-collections-3.2.1.jar,
  lib/org.apache.servicemix.bundles.scribe-1.3.3_1.jar,
- lib/commons-codec-1.9.jar,
  lib/shiro-ehcache-1.2.3.jar,
- lib/ehcache-core-2.4.7.jar,
- lib/slf4j-api-1.7.5.jar,
- lib/slf4j-simple-1.7.5.jar
+ lib/ehcache-core-2.4.7.jar
 Require-Bundle: javax.servlet;bundle-version="2.5.0",
  com.sap.sse.security.userstore,
  com.google.gwt.osgi,
  slf4j.api;bundle-version="1.6.4",
  org.json.simple,
  com.sun.jersey,
- org.eclipse.osgi
+ org.eclipse.osgi,
+ org.apache.commons.logging;bundle-version="1.1.1",
+ org.apache.commons.beanutils;bundle-version="1.8.0"
 Web-ContextPath: /security
 Export-Package: com.sap.sse.security,
  org.apache.shiro,
diff --git a/java/com.sap.sse.security/build.properties b/java/com.sap.sse.security/build.properties
index c05c1bed15e..c7627609d3b 100644
--- a/java/com.sap.sse.security/build.properties
+++ b/java/com.sap.sse.security/build.properties
@@ -5,14 +5,8 @@ bin.includes = META-INF/,\
                .,\
                WEB-INF/,\
                resources/shiro.ini,\
-               lib/commons-beanutils-1.9.0.jar,\
-               lib/commons-collections-3.2.1.jar,\
-               lib/commons-logging-1.1.3.jar,\
                lib/org.apache.servicemix.bundles.scribe-1.3.3_1.jar,\
                lib/shiro-core-1.2.2.jar,\
                lib/shiro-web-1.2.2.jar,\
-               lib/commons-codec-1.9.jar,\
                lib/shiro-ehcache-1.2.3.jar,\
-               lib/ehcache-core-2.4.7.jar,\
-               lib/slf4j-api-1.7.5.jar,\
-               lib/slf4j-simple-1.7.5.jar
+               lib/ehcache-core-2.4.7.jar
\ No newline at end of file
diff --git a/java/com.sap.sse.security/lib/commons-beanutils-1.9.0.jar b/java/com.sap.sse.security/lib/commons-beanutils-1.9.0.jar
deleted file mode 100644
index 3035162580c..00000000000
Binary files a/java/com.sap.sse.security/lib/commons-beanutils-1.9.0.jar and /dev/null differ
diff --git a/java/com.sap.sse.security/lib/commons-codec-1.9.jar b/java/com.sap.sse.security/lib/commons-codec-1.9.jar
deleted file mode 100644
index ef35f1c50d7..00000000000
Binary files a/java/com.sap.sse.security/lib/commons-codec-1.9.jar and /dev/null differ
diff --git a/java/com.sap.sse.security/lib/commons-collections-3.2.1.jar b/java/com.sap.sse.security/lib/commons-collections-3.2.1.jar
deleted file mode 100644
index c35fa1fee14..00000000000
Binary files a/java/com.sap.sse.security/lib/commons-collections-3.2.1.jar and /dev/null differ
diff --git a/java/com.sap.sse.security/lib/commons-logging-1.1.3.jar b/java/com.sap.sse.security/lib/commons-logging-1.1.3.jar
deleted file mode 100644
index ab5125407a6..00000000000
Binary files a/java/com.sap.sse.security/lib/commons-logging-1.1.3.jar and /dev/null differ
diff --git a/java/com.sap.sse.security/lib/slf4j-api-1.7.5.jar b/java/com.sap.sse.security/lib/slf4j-api-1.7.5.jar
deleted file mode 100644
index 8766455d875..00000000000
Binary files a/java/com.sap.sse.security/lib/slf4j-api-1.7.5.jar and /dev/null differ
diff --git a/java/com.sap.sse.security/lib/slf4j-simple-1.7.5.jar b/java/com.sap.sse.security/lib/slf4j-simple-1.7.5.jar
deleted file mode 100644
index 9dece319e93..00000000000
Binary files a/java/com.sap.sse.security/lib/slf4j-simple-1.7.5.jar and /dev/null differ