diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
index fb63098df79..af0ef849129 100755
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -10,11 +10,6 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.domain.tractracadapter,
  com.sap.sailing.mongodb,
  com.mongodb.driver;bundle-version="2.6.2",
- com.sap.ui5.commons,
- com.sap.ui5.core,
- com.sap.ui5.resource,
- com.sap.ui5.gwt.commons,
- com.sap.ui5.gwt.core,
  com.sap.sailing.domain.swisstimingadapter,
  com.sap.sailing.domain.persistence,
  com.sap.sailing.domain.swisstimingadapter.persistence,
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
index 3bb43182118..9b057d3842d 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
@@ -21,9 +21,6 @@
   <inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
   <inherits name='ca.nanometrics.gflot.GFlot'/>
   
-  <!-- Phoenix Stuff -->
-  <inherits name='com.sap.ui.commons.Module' />
-
   <inherits name="com.google.gwt.resources.Resources" />
     <inherits name="com.google.gwt.logging.Logging"/>
   
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
index 957cbfbed92..e6f0ba38dfa 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
@@ -22,9 +22,6 @@
   <inherits name='ca.nanometrics.gflot.GFlot'/>
   <inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
   
-  <!-- Phoenix Stuff -->
-  <inherits name='com.sap.ui.commons.Module' />
-  
   <!-- Other module inherits                                      -->
   <inherits name="com.sap.sailing.domain.SailingDomain" />
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
index e0318e19d9b..6339a1da608 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
@@ -21,9 +21,6 @@
   <inherits name='ca.nanometrics.gflot.GFlot'/>
   <inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
   
-  <!-- Phoenix Stuff -->
-  <inherits name='com.sap.ui.commons.Module' />
-  
   <!-- Other module inherits                                      -->
   <inherits name="com.sap.sailing.domain.SailingDomain" />
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml
index bb5cc7f9095..9fd86175033 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml
@@ -22,9 +22,6 @@
   <inherits name='ca.nanometrics.gflot.GFlot'/>
   <inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
   
-  <!-- Phoenix Stuff -->
-  <inherits name='com.sap.ui.commons.Module' />
-  
   <!-- Other module inherits                                      -->
   <inherits name="com.sap.sailing.domain.SailingDomain" />
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Spectator.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Spectator.gwt.xml
index e4b33f249b5..e3d153062fd 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Spectator.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Spectator.gwt.xml
@@ -22,9 +22,6 @@
   <inherits name='ca.nanometrics.gflot.GFlot'/>
   <inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
   
-  <!-- Phoenix Stuff -->
-  <inherits name='com.sap.ui.commons.Module' />
-
   <inherits name="com.google.gwt.resources.Resources" />
   
   <!-- Other module inherits                                      -->
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.gwt.xml
index 5d41463d20b..a64459f2620 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.gwt.xml
@@ -21,9 +21,6 @@
   <inherits name='ca.nanometrics.gflot.GFlot'/>
   <inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
   
-  <!-- Phoenix Stuff -->
-  <inherits name='com.sap.ui.commons.Module' />
-  
   <!-- Other module inherits                                      -->
   <inherits name="com.sap.sailing.domain.SailingDomain" />
 
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local-extern.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local-extern.target
index e94ce94bc09..53258de7c66 100644
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local-extern.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local-extern.target
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.6"?>
 
-<target name="Race Analysis Target (IDE external)" sequenceNumber="49">
+<target name="Race Analysis Target (IDE external)" sequenceNumber="50">
 <locations>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
-<repository location="http://sapcoe-app01.pironet-ndh.com/p2/sap/com.sap.ui5.updatesite-1.1.0-assembly"/>
+<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.R37x_v20110907-7uF9LFpFFSuN6-tKJIXPMYaq7NTP"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
 </location>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
@@ -18,9 +16,5 @@
 <unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
 <repository location="http://sapcoe-app01.pironet-ndh.com/p2/sailing/"/>
 </location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.R37x_v20110907-7uF9LFpFFSuN6-tKJIXPMYaq7NTP"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
 </locations>
 </target>
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 3865331c455..3d034cc6401 100644
--- 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
@@ -4,12 +4,6 @@
 <target name="Race Analysis Target (IDE - with local p2 repositories)" sequenceNumber="45">
 <locations>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
-<repository location="http://nexus.wdf.sap.corp:8081/nexus/content/repositories/build.snapshots.unzip/com/sap/ui5/com.sap.ui5.updatesite/1.1.0/com.sap.ui5.updatesite-1.1.0-assembly.zip-unzip/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
 <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
 </location>
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
index bbe34e69f7f..2c7e07347a4 100644
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
@@ -8,12 +8,6 @@
 <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.5.4.v20111024/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
-<repository location="http://sapcoe-app01.pironet-ndh.com/p2/sap/com.sap.ui5.updatesite-1.1.0-assembly"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
 <unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
 <repository location="http://sapcoe-app01.pironet-ndh.com/p2/sailing/"/>
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
index 28f204407fd..f57ceca6503 100644
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
@@ -1,15 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.6"?>
 
 <target name="Race Analysis Target (Maven - local build)" sequenceNumber="31">
 <locations>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.ui5.runtime.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.uilib.feature.feature.group" version="1.1.0"/>
-<unit id="com.sap.ui5.gwt.core.feature.feature.group" version="1.1.0"/>
-<repository location="http://nexus.wdf.sap.corp:8081/nexus/content/repositories/build.snapshots.unzip/com/sap/ui5/com.sap.ui5.updatesite/1.1.0/com.sap.ui5.updatesite-1.1.0-assembly.zip-unzip/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
 <unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
 <repository location="http://sapcoe-app01.pironet-ndh.com/p2/sailing/"/>