diff --git a/src/backend/urls.py b/src/backend/urls.py
index f916b9cc349a9a3467ad24aaf196d6294789c388..996168754d3719686880c38f7abf91b8f42941c8 100644
--- a/src/backend/urls.py
+++ b/src/backend/urls.py
@@ -35,17 +35,6 @@ def render_angular_en(request):
     return render(request, "en/index.html")
 
 
-def _static_butler(request, path, **kwargs):
-    """
-    Serve static files using the django static files configuration
-    WITHOUT collectstatic. This is slower, but very useful for API 
-    only servers where the static files are really just for /admin
-
-    Passing insecure=True allows serve_static to process, and ignores
-    the DEBUG=False setting
-    """
-    return serve_static(request, path, insecure=True, **kwargs)
-
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("api/v1/consents/", include("consents.urls")),
diff --git a/src/providers/views.py b/src/providers/views.py
index 58927b6a0052c13cbd05ba8ab27c1c9fd6769fd3..b714be0059681860a48df4905e719a4d1f270472 100644
--- a/src/providers/views.py
+++ b/src/providers/views.py
@@ -794,7 +794,7 @@ class RunResultsRetention(APIView):
         try:
             AnalyticsToken.objects.get(key=token)
             collection = lrs_db["results"]
-            query = {"analytics_token": token}
+            query = {"analytics_token": token, context_id: null}
             cursor = collection.find(query, sort=[("created_at", -1)]).skip(31)
             document_ids = [document["_id"] for document in cursor]