diff --git a/rowers/tasks.py b/rowers/tasks.py
index b571261c..dc71b058 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -357,6 +357,8 @@ def correct_intensity(workout):
 
     return workout
 
+<<<<<<< HEAD
+=======
 import io
 import zipfile
 
@@ -426,6 +428,7 @@ def email_all_user_workouts_zip(rower, start_date=None, end_date=None, debug=Fal
 
     return 1
     
+>>>>>>> release/v23.9.0
 
 @app.task
 def handle_loadnextweek(rower, debug=False, **kwargs):
@@ -4591,4 +4594,3 @@ def fetch_strava_workout(stravatoken, oauth_data, stravaid, csvfilename, userid,
             stravaid=stravaid, userid=userid))
 
     return 1
-
diff --git a/rowers/templates/export_workouts_daterange.html b/rowers/templates/export_workouts_daterange.html
deleted file mode 100644
index 178c22a2..00000000
--- a/rowers/templates/export_workouts_daterange.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "newbase.html" %}
-{% load static %}
-{% load rowerfilters %}
-
-{% block title %}Export Workouts{% endblock %}
-
-{% block main %}
-<div class="container mt-5">
-    <div class="row">
-        <div class="col-md-8 offset-md-2">
-            <h2>Export All Your Workouts</h2>
-            <p>Select a date range to export your workouts as a ZIP file containing individual CSV files.</p>
-            
-            <form method="post" enctype="multipart/form-data">
-                {% csrf_token %}
-		<table>
-		  {{ form.as_table }}
-		  </table>
-		<input name="daterange" type="submit" value="Export Workouts">
-            </form>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html
index 539199ef..ea9f09b1 100644
--- a/rowers/templates/rower_exportsettings.html
+++ b/rowers/templates/rower_exportsettings.html
@@ -7,10 +7,6 @@
 {% block main %}
 <h1>Import and Export Settings for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
-<p>
-  <a href="/rowers/workouts/alluserworkouts/">Export all workouts</a>
-</p>
-
 <form enctype="multipart/form-data" action="" method="post">
   {% csrf_token %}
 <ul class="main-content">
diff --git a/rowers/templates/workouts_export_email.html b/rowers/templates/workouts_export_email.html
deleted file mode 100644
index 42ced93d..00000000
--- a/rowers/templates/workouts_export_email.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "emailbase.html" %}
-{% block body %}
-<p>
-  You can download the file {{ filename }} from the following link: {{ download_url }}. The file will be deleted after downloading, so please make sure to download it as soon as possible.
-</p>
-
-
-<p>
-  Best Regards, the Rowsandall Team
-</p>
-{% endblock %}
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index d87ca6f9..a3ba1af5 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/urls.py b/rowers/urls.py
index 14e77eb0..b92ea953 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -432,10 +432,6 @@ urlpatterns = [
             views.graphs_view, name='graphs_view'),
     re_path(r'^createmarkerworkouts/user/(?P<userid>\d+)/$', views.create_marker_workouts_view,
             name='create_marker_workouts_view'),
-    re_path(r'^workouts/alluserworkouts/$', views.export_all_workouts_zip_view, 
-            name='workout_export_all_workouts_zip_view'),
-    re_path(r'^workouts/download/$', views.download_zip_file_view,
-            name='download_zip_file_view'),    
     re_path(r'^createmarkerworkouts/$', views.create_marker_workouts_view,
             name='create_marker_workouts_view'),
     re_path(r'^goldmedalscores/$', views.goldmedalscores_view,
diff --git a/rowers/views/exportviews.py b/rowers/views/exportviews.py
index 0b62bdc2..3504e59f 100644
--- a/rowers/views/exportviews.py
+++ b/rowers/views/exportviews.py
@@ -273,53 +273,6 @@ def workout_csvemail_view(request, id=0):
 
     return response
 
-import io
-
-# Export all workouts as ZIP file with individual CSV files
-@login_required()
-def export_all_workouts_zip_view(request):
-    from datetime import datetime
-    r = getrower(request.user)
-
-    if request.method == 'GET':
-        form = DateRangeForm()
-    elif request.method == 'POST':
-        form = DateRangeForm(request.POST)
-        if not form.is_valid():
-            messages.error(request, "Invalid date range. Please try again.")
-            return render(request, "export_workouts_daterange.html", {'form': form})
-
-        startdate = form.cleaned_data['startdate']
-        enddate = form.cleaned_data['enddate']
-
-        myqueue(queuehigh, email_all_user_workouts_zip, r, startdate, enddate)
-
-        successmessage = "A download link will be sent to you per email"
-        messages.info(request, successmessage)
-
-    # return to export settings view
-    return render(request, "export_workouts_daterange.html", {'form': form})
-
-def download_zip_file_view(request):
-    # This view would be called when the user clicks the download link in the email
-    zip_file_path = request.GET.get('file')
-    print("Requested ZIP file path:", zip_file_path)  # Debugging statement
-    # add media folder
-    zip_file_path = os.path.join(settings.MEDIA_ROOT, zip_file_path)
-        
-    if not zip_file_path or not os.path.exists(zip_file_path):
-        messages.error(request, "The requested file does not exist.")
-        return HttpResponseRedirect(reverse('workouts_view'))
-        
-    with open(zip_file_path, 'rb') as f:
-        response = HttpResponse(f.read(), content_type='application/zip')
-        response['Content-Disposition'] = f'attachment; filename="{os.path.basename(zip_file_path)}"'
-
-    # remove the file after sending
-    os.remove(zip_file_path)
-        
-    return response
-
 
 # Get Workout CSV file and send it to user's email address
 @login_required()
@@ -344,5 +297,3 @@ def workout_csvtoadmin_view(request, id=0):  # pragma: no cover
     response = HttpResponseRedirect(url)
 
     return response
-
-
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index b0e8528e..84a62fdb 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -254,7 +254,6 @@ from rowers.rows import handle_uploaded_file, handle_uploaded_image
 from rowers.plannedsessions import *
 from rowers.tasks import handle_makeplot, handle_otwsetpower, handle_sendemailtcx, handle_sendemailcsv
 from rowers.tasks import (
-    email_all_user_workouts_zip, 
     handle_intervals_updateworkout,
     handle_post_workout_api,
     handle_sendemail_newftp,