diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateListener.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateListener.java
index 681d9c1ca3c..5ba9c5181e8 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateListener.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateListener.java
@@ -2,11 +2,9 @@ package com.sap.sailing.racecommittee.app.services;
 
 import com.sap.sailing.domain.common.TimePoint;
 import com.sap.sailing.racecommittee.app.domain.ManagedRace;
-import com.sap.sailing.racecommittee.app.domain.state.RaceState;
-import com.sap.sailing.racecommittee.app.domain.state.RaceStateChangedListener;
 import com.sap.sailing.racecommittee.app.domain.state.RaceStateEventListener;
 
-public class RaceStateListener implements RaceStateChangedListener, RaceStateEventListener {
+public class RaceStateListener implements RaceStateEventListener {
     @SuppressWarnings("unused")
     private final static String TAG = RaceStateListener.class.getName();
 
@@ -18,10 +16,6 @@ public class RaceStateListener implements RaceStateChangedListener, RaceStateEve
         this.race = race;
     }
 
-    public void onRaceStateChanged(RaceState state) {
-        //service.registerAlarms(race, state);
-    }
-
     @Override
     public void onStartTimeChanged(TimePoint startTime) {
         service.handleNewStartTime(race, startTime);
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
index 89ced6ca18e..8f6abce7a3f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
@@ -237,13 +237,10 @@ public class RaceStateService extends Service {
             state.getRaceLog().addListener(logListener);
 
             // ... register on state changes!
-            RaceStateChangedListener stateListener = new RaceStateListener(this, race);
             RaceStateEventListener eventListener = new RaceStateListener(this, race);
-            state.registerStateChangeListener(stateListener);
             state.registerStateEventListener(eventListener);
 
             this.registeredLogListeners.put(race, logListener);
-            this.registeredStateChangeListeners.put(race, stateListener);
             this.registeredStateEventListeners.put(race, eventListener);
             
             ExLog.i(TAG, "Race " + race.getId() + " registered.");