diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/LeaderboardWithHeaderPerspective.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/LeaderboardWithHeaderPerspective.java
index 24c28f9c924..d25a0aaaf10 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/LeaderboardWithHeaderPerspective.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/LeaderboardWithHeaderPerspective.java
@@ -27,7 +27,7 @@ import com.sap.sse.gwt.client.ErrorReporter;
 import com.sap.sse.gwt.client.async.AsyncActionsExecutor;
 import com.sap.sse.gwt.client.player.Timer;
 import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent;
-import com.sap.sse.gwt.client.shared.perspective.AbstractRootPerspectiveComposite;
+import com.sap.sse.gwt.client.shared.perspective.AbstractPerspectiveComposite;
 import com.sap.sse.gwt.client.shared.perspective.PerspectiveLifecycleWithAllSettings;
 import com.sap.sse.gwt.client.useragent.UserAgentDetails;
 import com.sap.sse.security.ui.client.UserService;
@@ -38,7 +38,7 @@ import com.sap.sse.security.ui.client.UserService;
  * @author Frank Mittag
  *
  */
-public class LeaderboardWithHeaderPerspective extends AbstractRootPerspectiveComposite<LeaderboardWithHeaderPerspectiveLifecycle,
+public class LeaderboardWithHeaderPerspective extends AbstractPerspectiveComposite<LeaderboardWithHeaderPerspectiveLifecycle,
     LeaderboardWithHeaderPerspectiveSettings> implements LeaderboardUpdateProvider {
     private final DockLayoutPanel dockPanel;
     private final static int SAP_HEADER_HEIGHT = 75;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
index d88cc9312de..b8159d6d6db 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
@@ -91,7 +91,7 @@ import com.sap.sse.gwt.client.player.Timer;
 import com.sap.sse.gwt.client.shared.components.Component;
 import com.sap.sse.gwt.client.shared.components.SettingsDialog;
 import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent;
-import com.sap.sse.gwt.client.shared.perspective.AbstractRootPerspectiveComposite;
+import com.sap.sse.gwt.client.shared.perspective.AbstractPerspectiveComposite;
 import com.sap.sse.gwt.client.shared.perspective.PerspectiveLifecycleWithAllSettings;
 import com.sap.sse.gwt.client.useragent.UserAgentDetails;
 import com.sap.sse.gwt.shared.GwtHttpRequestUtils;
@@ -110,7 +110,7 @@ import com.sap.sse.security.ui.client.UserService;
  * @author Frank Mittag, Axel Uhl (d043530)
  *
  */
-public class RaceBoardPanel extends AbstractRootPerspectiveComposite<RaceBoardPerspectiveLifecycle, RaceBoardPerspectiveSettings> implements LeaderboardUpdateListener, PopupPositionProvider, RequiresResize
+public class RaceBoardPanel extends AbstractPerspectiveComposite<RaceBoardPerspectiveLifecycle, RaceBoardPerspectiveSettings> implements LeaderboardUpdateListener, PopupPositionProvider, RequiresResize
 {
     private final SailingServiceAsync sailingService;
     private final MediaServiceAsync mediaService;
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/perspective/AbstractComponentContextWithSettingsStorage.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/perspective/AbstractComponentContextWithSettingsStorage.java
index 1847fdea2e1..84028491358 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/perspective/AbstractComponentContextWithSettingsStorage.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/perspective/AbstractComponentContextWithSettingsStorage.java
@@ -51,15 +51,10 @@ public abstract class AbstractComponentContextWithSettingsStorage<PL extends Per
         
         final PerspectiveCompositeSettings<PS> newRootPerspectiveSettings;
         if(parentPerspective == null) {
-            if(component instanceof AbstractRootPerspectiveComposite) {
-                //root perspective is updating its perspective own settings
-                AbstractRootPerspectiveComposite<? extends PerspectiveLifecycle<PS>, PS> rootPerspective = (AbstractRootPerspectiveComposite<? extends PerspectiveLifecycle<PS>, PS>) component;
-                newRootPerspectiveSettings = (PerspectiveCompositeSettings<PS>)newDefaultSettings;
-                rootPerspective.getPerspectiveLifecycleWithAllSettings().setAllSettings(newRootPerspectiveSettings);
-            } else {
-                throw new IllegalStateException("Component must belong to a perspective when updating default settings");
-            }
-            
+            //root perspective is updating its perspective own settings
+            Perspective<PS> rootPerspective = (Perspective<PS>) component;
+            newRootPerspectiveSettings = (PerspectiveCompositeSettings<PS>)newDefaultSettings;
+            rootPerspective.getPerspectiveLifecycleWithAllSettings().setAllSettings(newRootPerspectiveSettings);
         } else {
             newRootPerspectiveSettings = (PerspectiveCompositeSettings<PS>) updatePerspectiveLifecycleWithAllSettings(parentPerspective, component, newDefaultSettings);
         }
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/perspective/AbstractRootPerspectiveComposite.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/perspective/AbstractRootPerspectiveComposite.java
deleted file mode 100644
index 2d750c94080..00000000000
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/perspective/AbstractRootPerspectiveComposite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.sap.sse.gwt.client.shared.perspective;
-
-import com.sap.sse.common.settings.Settings;
-
-public abstract class AbstractRootPerspectiveComposite<PL extends PerspectiveLifecycle<PS>, PS extends Settings> extends AbstractPerspectiveComposite<PL, PS> {
-
-    public AbstractRootPerspectiveComposite(AbstractComponentContextWithSettingsStorage<PL, PS> componentContext,
-            PerspectiveLifecycleWithAllSettings<PL, PS> perspectiveLifecycleWithAllSettings) {
-        super(componentContext, perspectiveLifecycleWithAllSettings);
-    }
-    
-}