diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java b/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java
index cc861e961..32817ab80 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java
@@ -76,12 +76,4 @@ public class HandlerServer {
         void newTrackPoint(TrackPoint trackPoint, int gpsAccuracy);
         void newGpsStatus(GpsStatusValue gpsStatusValue);
     }
-
-    public interface Handler {
-        void onStart(@NonNull Context context);
-
-        void onStop(@NonNull Context context);
-
-        void onSharedPreferenceChanged(@NonNull Context context, @NonNull SharedPreferences preferences, String key);
-    }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
index 859226254..c07dc7f12 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
@@ -17,7 +17,7 @@ import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
-class LocationHandler implements HandlerServer.Handler, LocationListener, GpsStatus.GpsStatusListener {
+class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener {
 
     private final String TAG = LocationHandler.class.getSimpleName();
 
@@ -33,7 +33,6 @@ class LocationHandler implements HandlerServer.Handler, LocationListener, GpsSta
         this.handlerServer = handlerServer;
     }
 
-    @Override
     public void onStart(@NonNull Context context) {
         gpsStatus = new GpsStatus(context, this);
         locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
@@ -41,7 +40,6 @@ class LocationHandler implements HandlerServer.Handler, LocationListener, GpsSta
         gpsStatus.start();
     }
 
-    @Override
     public void onStop(@NonNull Context context) {
         unregisterLocationListener();
         locationManager = null;
@@ -51,7 +49,6 @@ class LocationHandler implements HandlerServer.Handler, LocationListener, GpsSta
         }
     }
 
-    @Override
     public void onSharedPreferenceChanged(@NonNull Context context, @NonNull SharedPreferences sharedPreferences, String key) {
         if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) {
             int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, context);