diff --git a/src/androidTest/java/de/dennisguse/opentracks/TestRunner.java b/src/androidTest/java/de/dennisguse/opentracks/TestRunner.java
index ee235f127..0d6cdcedb 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/TestRunner.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/TestRunner.java
@@ -3,7 +3,6 @@ package de.dennisguse.opentracks;
 import android.app.Application;
 import android.content.Context;
 
-import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.runner.AndroidJUnitRunner;
 
 public class TestRunner extends AndroidJUnitRunner {
diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java
index fd6b0981b..08c5d292e 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java
@@ -39,7 +39,6 @@ import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
 import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.util.PressureSensorUtils;
 
 /**
  * Tests insert location.
diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java
index 8d31b6f99..48952af37 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java
@@ -23,7 +23,6 @@ import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(JUnit4.class)
diff --git a/src/main/java/de/dennisguse/opentracks/content/data/DataField.java b/src/main/java/de/dennisguse/opentracks/content/data/DataField.java
index eb091881c..75624811d 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/DataField.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/DataField.java
@@ -1,6 +1,5 @@
 package de.dennisguse.opentracks.content.data;
 
-import android.content.Context;
 import android.content.res.Resources;
 
 import de.dennisguse.opentracks.R;
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/DirectoryChooserActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/DirectoryChooserActivity.java
index c03470728..be5cfc48c 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/DirectoryChooserActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/DirectoryChooserActivity.java
@@ -38,11 +38,6 @@ public abstract class DirectoryChooserActivity extends AppCompatActivity {
         onActivityResultCustom(requestCode, resultCode, resultData);
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
     protected void onActivityResultCustom(int requestCode, int resultCode, @Nullable Intent resultData) {
         if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 052faf866..e05126515 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -99,7 +99,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            Context context = TrackRecordingService.this;
             if (PreferencesUtils.isKey(R.string.stats_units_key, key)) {
                 boolean metricUnits = PreferencesUtils.isMetricUnits();
                 notificationManager.setMetricUnits(metricUnits);
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
index 500040ad9..c5c5d6f59 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
@@ -74,9 +74,7 @@ public class TrackPointCreator {
         altitudeSumManager.reset();
     }
 
-    //TODO TrackPoint should be created by TrackPointCreator; instead of in the TrackRecordingService.
-    @Deprecated
-    public SensorDataSet fill(TrackPoint trackPoint) {
+    private SensorDataSet fill(TrackPoint trackPoint) {
         SensorDataSet sensorDataSet = remoteSensorManager.fill(trackPoint);
         altitudeSumManager.fill(trackPoint);
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java b/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java
index b9fa9f920..05a01237e 100644
--- a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java
@@ -23,7 +23,6 @@ import androidx.annotation.VisibleForTesting;
 
 import java.time.Duration;
 
-import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.services.TrackRecordingService;
diff --git a/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java
index 8b28ed677..16b130453 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java
@@ -1,10 +1,7 @@
 package de.dennisguse.opentracks.settings;
 
 import android.os.Bundle;
-import android.util.Log;
 
-import androidx.fragment.app.DialogFragment;
-import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.R;
diff --git a/src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java b/src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java
index 98fda5472..c8a259eb1 100644
--- a/src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java
@@ -3,7 +3,6 @@ package de.dennisguse.opentracks.util;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
@@ -15,7 +14,6 @@ import android.view.MenuItem;
 import android.widget.AbsListView;
 import android.widget.ListView;
 
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SearchView;
 
 import java.util.ArrayList;
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index e3e462483..91640fb5e 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -25,12 +25,6 @@ limitations under the License.
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="TrackDeleteActivity" parent="ThemeCustom">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowIsFloating">true</item>
-    </style>
-
     <style name="SplashTheme" parent="ThemeCustom">
         <item name="android:statusBarColor">@color/splashscreen_background</item>
         <item name="android:navigationBarColor">@color/splashscreen_background</item>