diff --git a/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java
index f9d7f157a..1a0fb0e35 100644
--- a/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java
+++ b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java
@@ -52,7 +52,6 @@ public class ShareContentProvider extends CustomContentProvider {
     private static final int URI_GPX = 0;
     private static final int URI_KML_WITH_TRACKDETAIL_SENSORDATA = 3;
 
-    private static final int URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA = 6;
     private static final int URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES = 7;
     private static final int URI_CSV = 8;
 
@@ -64,7 +63,6 @@ public class ShareContentProvider extends CustomContentProvider {
 
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.getPreferenceId() + "/*/*", URI_KML_WITH_TRACKDETAIL_SENSORDATA);
 
-        uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.getPreferenceId() + "/*/*", URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA);
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES.getPreferenceId() + "/*/*", URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES);
         uriMatcher.addURI(ContentProviderUtils.AUTHORITY_PACKAGE, TracksColumns.TABLE_NAME + "/" + TrackFileFormat.CSV.getPreferenceId() + "/*/*", URI_CSV);
     }
@@ -133,8 +131,6 @@ public class ShareContentProvider extends CustomContentProvider {
             case URI_GPX -> TrackFileFormat.GPX;
             case URI_KML_WITH_TRACKDETAIL_SENSORDATA ->
                     TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA;
-            case URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA ->
-                    TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA;
             case URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES ->
                     TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES;
             case URI_CSV -> TrackFileFormat.CSV;
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java
index 8ad43624c..2d49cd58b 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java
@@ -41,45 +41,18 @@ public enum TrackFileFormat {
         }
     },
 
-    @Deprecated //TODO Check if we really need this
-    KMZ_WITH_TRACKDETAIL_AND_SENSORDATA("KMZ_WITH_TRACKDETAIL_AND_SENSORDATA") {
-
-        private static final boolean exportPhotos = false;
-
-        @Override
-        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
-            KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
-            return new KMZTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
-        }
-
-        @Override
-        public String getMimeType() {
-            return "application/vnd.google-earth.kmz";
-        }
-
-        public String getExtension() {
-            return "kmz";
-        }
-
-        @Override
-        public boolean includesPhotos() {
-            return exportPhotos;
-        }
-    },
-
     KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES("KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES") {
 
         private static final boolean exportPhotos = true;
 
         @Override
         public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
-            KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
-            return new KMZTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
+            return new KMZTrackExporter(context, contentProviderUtils, exportPhotos);
         }
 
         @Override
         public String getMimeType() {
-            return KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.getMimeType();
+            return "application/vnd.google-earth.kmz";
         }
 
         public String getExtension() {
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java
index 274a968d0..056e47300 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java
@@ -220,6 +220,10 @@ public class KMLTrackExporter implements TrackExporter {
         printWriter = null;
     }
 
+    boolean isExportPhotos() {
+        return exportPhotos;
+    }
+
     private void writeHeader(List<Track> tracks) {
         printWriter.println(
                 """
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java
index 90aa703ef..b6d4905c8 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMZTrackExporter.java
@@ -54,14 +54,12 @@ public class KMZTrackExporter implements TrackExporter {
     private final ContentProviderUtils contentProviderUtils;
     private final KMLTrackExporter fileTrackExporter;
 
-    private final boolean exportPhotos;
     private final Context context;
 
-    public KMZTrackExporter(Context context, ContentProviderUtils contentProviderUtils, KMLTrackExporter trackExporter, boolean exportPhotos) {
+    public KMZTrackExporter(Context context, ContentProviderUtils contentProviderUtils, boolean exportPhotos) {
         this.context = context;
         this.contentProviderUtils = contentProviderUtils;
-        this.fileTrackExporter = trackExporter;
-        this.exportPhotos = exportPhotos;
+        this.fileTrackExporter =  new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
     }
 
     @Override
@@ -79,7 +77,7 @@ public class KMZTrackExporter implements TrackExporter {
             }
 
             // Add photos
-            if (exportPhotos) addImages(context, tracks ,zipOutputStream);
+            if (fileTrackExporter.isExportPhotos()) addImages(context, tracks ,zipOutputStream);
             return true;
         } catch (InterruptedException | IOException e) {
             Log.e(TAG, "Unable to write track", e);
diff --git a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java
index a088f93e7..d67b428f0 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java
@@ -48,7 +48,6 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat {
     private void setExportTrackFileFormatOptions() {
         Map<String, String> options = TrackFileFormat.toPreferenceIdLabelMap(getResources(),
                 TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES,
-                TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA,
                 TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA,
                 TrackFileFormat.GPX,
                 TrackFileFormat.CSV);