diff --git a/java/com.sap.sailing.domain.test/SailingDomainTest (Proxy).launch b/java/com.sap.sailing.domain.test/SailingDomainTest (Proxy).launch
index 4455ce75a78..99a688ba679 100755
--- a/java/com.sap.sailing.domain.test/SailingDomainTest (Proxy).launch	
+++ b/java/com.sap.sailing.domain.test/SailingDomainTest (Proxy).launch	
@@ -16,5 +16,5 @@
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.domain.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 -XX:+UseParallelGC -Dtractrac.tunnel=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 -XX:+UseParallelGC -Dtractrac.tunnel=true -Dtractrac.tunnel.host=10.18.10.38"/>
 </launchConfiguration>
diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java
index 70a202dc067..3302deffe94 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java
@@ -12,6 +12,7 @@ import java.nio.charset.Charset;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -101,7 +102,12 @@ public class CountryCodeTest {
     @Test
     public void testGermanyCountryCode() {
         for (Locale l : Locale.getAvailableLocales()) {
-            System.out.println(""+l+"/"+l.getISO3Country());
+            try {
+                l.getISO3Country();
+            } catch (MissingResourceException e) {
+                // The "Serbia and Montenegro" locale has no ISO3 code due to the split-up
+                assertEquals("sr_CS", l.toString());
+            }
         }
         assertEquals("DEU", Locale.GERMANY.getISO3Country());
         assertEquals("DE", Locale.GERMANY.getCountry());
diff --git a/java/com.sap.sailing.targetplatform/.project b/java/com.sap.sailing.targetplatform/.project
index a5e89c3b8a2..7122082d0c5 100644
--- a/java/com.sap.sailing.targetplatform/.project
+++ b/java/com.sap.sailing.targetplatform/.project
@@ -5,24 +5,5 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
 </projectDescription>
diff --git a/java/com.sap.sailing.targetplatform/CreateLocalBaseP2Repository.launch b/java/com.sap.sailing.targetplatform/CreateLocalBaseP2Repository.launch
deleted file mode 100755
index 470c9118e8f..00000000000
--- a/java/com.sap.sailing.targetplatform/CreateLocalBaseP2Repository.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="\com.sap.sailing.target"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.sap.sailing.targetplatform"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.launcher.Main"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher&#13;&#10;  -metadataRepository file:/${project_loc:com.sap.sailing.targetplatform.base}/gen/p2&#13;&#10;  -artifactRepository file:/${project_loc:com.sap.sailing.targetplatform.base}/gen/p2&#13;&#10;  -source ${project_loc:com.sap.sailing.targetplatform.base}&#13;&#10;  -publishArtifacts -publishArtifactRepository -compress -noDefaultIUs"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.targetplatform"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256m"/>
-</launchConfiguration>
diff --git a/java/com.sap.sailing.targetplatform/META-INF/MANIFEST.MF b/java/com.sap.sailing.targetplatform/META-INF/MANIFEST.MF
deleted file mode 100755
index add1183a52b..00000000000
--- a/java/com.sap.sailing.targetplatform/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Sailing Server
-Bundle-SymbolicName: com.sap.sailing.targetplatform
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ClassPath: .
-Require-Bundle: org.eclipse.equinox.launcher;bundle-version="1.2.0"