diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
index c1d33da3c..0da83b43e 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
@@ -78,7 +78,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
     private enum ConflictResolutionStrategy {
         CONFLICT_NONE,
         CONFLICT_OVERWRITE,
-        CONFLICT_SKIP;
+        CONFLICT_SKIP
     }
 
     private TrackFileFormat trackFileFormat;
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java
index ac4180776..04c5bc44c 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java
@@ -12,12 +12,6 @@ import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 import androidx.documentfile.provider.DocumentFile;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import de.dennisguse.opentracks.data.ContentProviderUtils;
-import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.ExportUtils;
 
 public class ExportService extends JobIntentService {
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportServiceResultReceiver.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportServiceResultReceiver.java
index d06a7dcf6..acea96baf 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportServiceResultReceiver.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportServiceResultReceiver.java
@@ -6,8 +6,6 @@ import android.os.ResultReceiver;
 
 import androidx.annotation.NonNull;
 
-import de.dennisguse.opentracks.data.models.Track;
-
 /**
  * Create a new ResultReceive to receive results.
  * Your {@link #onReceiveResult} method will be called from the thread running <var>handler</var> if given, or from an arbitrary thread if null.
diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java
index 203889da0..ec85fc469 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java
@@ -133,7 +133,7 @@ public class SettingsCustomLayoutEditAdapter extends RecyclerView.Adapter<Recycl
 
     private class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        CustomStatsItemBinding viewBinding;
+        final CustomStatsItemBinding viewBinding;
 
         public ViewHolder(@NonNull CustomStatsItemBinding viewBinding) {
             super(viewBinding.getRoot());