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 80e02e42808..747b3696a68 100755
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -38,3 +38,4 @@ Web-ContextPath: /gwt
 Bundle-ClassPath: WEB-INF/classes/,
  WEB-INF/lib/gwt-maps.jar,
  WEB-INF/lib/gwt-servlet.jar
+TrackLifecycle: true
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/admin/ServerCommandProvider.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/admin/ServerCommandProvider.java
deleted file mode 100644
index a834e17d357..00000000000
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/admin/ServerCommandProvider.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sap.sailing.server.admin;
-
-import org.eclipse.osgi.framework.console.CommandInterpreter;
-import org.eclipse.osgi.framework.console.CommandProvider;
-
-public class ServerCommandProvider implements CommandProvider {
-    public void _hello(CommandInterpreter ci) {
-        ci.print("Hello, " + ci.nextArgument());
-    }
-
-    public String getHelp() {
-        return "\thello - say hello\n";
-    }
-}
\ No newline at end of file
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
index 4e41cc7483a..5fbcd1a7001 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
@@ -11,8 +11,8 @@ import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
-import com.sap.sailing.domain.base.Regatta;
 import com.sap.sailing.domain.base.RaceDefinition;
+import com.sap.sailing.domain.base.Regatta;
 import com.sap.sailing.domain.common.impl.Util.Triple;
 import com.sap.sailing.server.RacingEventService;
 
@@ -20,6 +20,8 @@ public class Activator implements BundleActivator, ServiceListener {
     private static final Logger logger = Logger.getLogger(Activator.class.getName());
     
     private static BundleContext fContext;
+
+    private static ExtenderBundleTracker extenderBundleTracker;
     
     public static BundleContext getDefault() {
         return fContext;
@@ -27,6 +29,9 @@ public class Activator implements BundleActivator, ServiceListener {
 
     public void start(BundleContext context) throws Exception {
         fContext = context;
+        
+        extenderBundleTracker = new ExtenderBundleTracker(context);
+        extenderBundleTracker.open();
         RacingEventService service = new RacingEventServiceImpl();
 
         // register the racing service
@@ -38,6 +43,11 @@ public class Activator implements BundleActivator, ServiceListener {
     
     public void stop(BundleContext context) throws Exception {
         fContext = null;
+        
+        if(extenderBundleTracker != null) {
+            extenderBundleTracker.open();
+        }
+
         ServiceTracker<RacingEventService, RacingEventService> racingEventServiceTracker = new ServiceTracker<RacingEventService, RacingEventService>(context, RacingEventService.class.getName(), null);
         
         racingEventServiceTracker.open();
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/admin/ExtenderBundleTracker.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExtenderBundleTracker.java
similarity index 98%
rename from java/com.sap.sailing.server/src/com/sap/sailing/server/admin/ExtenderBundleTracker.java
rename to java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExtenderBundleTracker.java
index b1bd31a6523..9929568d82c 100644
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/admin/ExtenderBundleTracker.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExtenderBundleTracker.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.server.admin;
+package com.sap.sailing.server.impl;
 
 import java.util.logging.Logger;