diff --git a/src/main/java/de/dennisguse/opentracks/TabsAdapter.java b/src/main/java/de/dennisguse/opentracks/TabsAdapter.java
index e46ba7949..2e0aa2cf3 100644
--- a/src/main/java/de/dennisguse/opentracks/TabsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/TabsAdapter.java
@@ -24,6 +24,7 @@ import android.widget.TabHost;
 import android.widget.TabHost.TabContentFactory;
 import android.widget.TabWidget;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -79,6 +80,7 @@ public class TabsAdapter extends FragmentPagerAdapter implements TabHost.OnTabCh
     }
 
     @Override
+    @NonNull
     public Fragment getItem(int position) {
         TabInfo info = tabInfos.get(position);
         return Fragment.instantiate(context, info.clss.getName(), info.bundle);
diff --git a/src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java b/src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java
index eb38da5ff..341519e09 100644
--- a/src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java
+++ b/src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java
@@ -28,11 +28,6 @@ public class SensorDataSetLocation extends Location {
 
     private SensorDataSet sensorDataSet = null;
 
-    /**
-     * The id of this location from the provider.
-     */
-    private int id = -1;
-
     public SensorDataSetLocation(Location location, SensorDataSet sensorDataSet) {
         super(location);
         this.sensorDataSet = sensorDataSet;
@@ -50,17 +45,8 @@ public class SensorDataSetLocation extends Location {
         this.sensorDataSet = sensorDataSet;
     }
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
     public void reset() {
         super.reset();
         sensorDataSet = null;
-        id = -1;
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
index 387d9ee98..b0d495490 100644
--- a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
@@ -152,7 +152,6 @@ public class StatsUtils {
         boolean metricUnits = PreferencesUtils.isMetricUnits(activity);
         boolean reportSpeed = PreferencesUtils.isReportSpeed(activity);
         boolean isRecording = PreferencesUtils.isRecording(activity);
-        ;
 
         // Set total distance
         {