diff --git a/server.ts b/server.ts
index 8e358716e..605b94be0 100644
--- a/server.ts
+++ b/server.ts
@@ -123,7 +123,6 @@ import { apiFailMiddleware } from './server/middlewares/error'
 import { Redis } from './server/lib/redis'
 import { ActorFollowScheduler } from './server/lib/schedulers/actor-follow-scheduler'
 import { RemoveOldViewsScheduler } from './server/lib/schedulers/remove-old-views-scheduler'
-import { RemoveOldJobsScheduler } from './server/lib/schedulers/remove-old-jobs-scheduler'
 import { UpdateVideosScheduler } from './server/lib/schedulers/update-videos-scheduler'
 import { YoutubeDlUpdateScheduler } from './server/lib/schedulers/youtube-dl-update-scheduler'
 import { VideosRedundancyScheduler } from './server/lib/schedulers/videos-redundancy-scheduler'
@@ -310,7 +309,6 @@ async function startApplication () {
 
   // Enable Schedulers
   ActorFollowScheduler.Instance.enable()
-  RemoveOldJobsScheduler.Instance.enable()
   UpdateVideosScheduler.Instance.enable()
   YoutubeDlUpdateScheduler.Instance.enable()
   VideosRedundancyScheduler.Instance.enable()
diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts
index 982280b55..070d1d7a2 100644
--- a/server/lib/job-queue/handlers/video-live-ending.ts
+++ b/server/lib/job-queue/handlers/video-live-ending.ts
@@ -189,7 +189,7 @@ async function replaceLiveByReplay (options: {
 
   await assignReplayFilesToVideo({ video: videoWithFiles, replayDirectory })
 
-  // FIXME: should not happen in this function
+  // Should not happen in this function, but we keep the code if in the future we can replace the permanent live by a replay
   if (permanentLive) { // Remove session replay
     await remove(replayDirectory)
   } else { // We won't stream again in this live, we can delete the base replay directory
diff --git a/server/lib/schedulers/remove-old-jobs-scheduler.ts b/server/lib/schedulers/remove-old-jobs-scheduler.ts
deleted file mode 100644
index 6b05ea144..000000000
--- a/server/lib/schedulers/remove-old-jobs-scheduler.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { isTestOrDevInstance } from '../../helpers/core-utils'
-import { logger } from '../../helpers/logger'
-import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants'
-import { JobQueue } from '../job-queue'
-import { AbstractScheduler } from './abstract-scheduler'
-
-// FIXME: delete this scheduler in a few versions (introduced in 5.0)
-// We introduced job removal directly using bullmq option but we still need to delete old jobs
-export class RemoveOldJobsScheduler extends AbstractScheduler {
-
-  private static instance: AbstractScheduler
-
-  protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.REMOVE_OLD_JOBS
-
-  private constructor () {
-    super()
-  }
-
-  protected internalExecute () {
-    if (!isTestOrDevInstance()) logger.info('Removing old jobs in scheduler.')
-
-    return JobQueue.Instance.removeOldJobs()
-  }
-
-  static get Instance () {
-    return this.instance || (this.instance = new this())
-  }
-}