diff --git a/java/com.sap.sailing.feature/feature.xml b/java/com.sap.sailing.feature/feature.xml
index 0e2ff8d9145..7f05ba3ec9b 100755
--- a/java/com.sap.sailing.feature/feature.xml
+++ b/java/com.sap.sailing.feature/feature.xml
@@ -25,11 +25,6 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
       <import plugin="org.eclipse.osgi"/>
       <import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="com.mongodb.driver" version="2.6.2" match="greaterOrEqual"/>
-      <import plugin="com.sap.ui5.commons"/>
-      <import plugin="com.sap.ui5.core"/>
-      <import plugin="com.sap.ui5.resource"/>
-      <import plugin="com.sap.ui5.gwt.commons"/>
-      <import plugin="com.sap.ui5.gwt.core"/>
       <import plugin="com.google.gwt.osgi" version="2.4.0" match="greaterOrEqual"/>
    </requires>
 
@@ -172,4 +167,9 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="com.sap.sailing.www.events"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 </feature>
diff --git a/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml b/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
index 13e27a857bc..50c26ca5785 100755
--- a/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
+++ b/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
@@ -14,16 +14,6 @@
 		<url-pattern>/sailing</url-pattern>
 	</servlet-mapping>
 	
-	<servlet>
-		<display-name>ResourceServlet</display-name>
-		<servlet-name>ResourceServlet</servlet-name>
-		<servlet-class>com.sap.ui5.resource.ResourceServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ResourceServlet</servlet-name>
-		<url-pattern>/resources/*</url-pattern>
-	</servlet-mapping>
-
 	<!-- enabling remote logging -->
 	<servlet>
 		<servlet-name>remoteLoggingServlet</servlet-name>
@@ -34,6 +24,4 @@
 		<servlet-name>remoteLoggingServlet</servlet-name>
 		<url-pattern>/com.sap.sailing.gwt.ui.AdminConsole/remote_logging</url-pattern>
 	</servlet-mapping>
-
-	
 </web-app>