diff --git a/src/commands.py b/src/commands.py
index 88fb876..8e00a82 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -214,16 +214,10 @@ def disable(update: Update, context: CallbackContext):
 
     # Check if name is running
     name = context.args[0]
-    if user not in tasks or name not in tasks[user]:
+    if not scheduler.isStarted(user, name):
         return "*Error:* %s isn't enabled." % name
 
-    # Stop and remove task
-    job = tasks[user][name]
-    job.enabled = False
-    job.schedule_removal()
-    tasks[user].pop(name, None)
-    database.userStatus[user]['enabledTasks'].remove(name)
-    database.save()
+    scheduler.stop(user, name)
 
     return "Removed!"
 
diff --git a/src/scheduler.py b/src/scheduler.py
index dd0e1ea..59bf6d1 100644
--- a/src/scheduler.py
+++ b/src/scheduler.py
@@ -70,3 +70,6 @@ class Scheduler:
         self.database.userRequests[user][name]['enabled'] = False
         self.database.save()
 
+    def isStarted(self, user: str, name: str):
+        return user in self.tasks and name in self.tasks[user]
+