diff --git a/agent/core.py b/agent/core.py
index 2e49e42..508a915 100644
--- a/agent/core.py
+++ b/agent/core.py
@@ -72,4 +72,7 @@ class Agent(object):
                     job.successors.append(transporter.jobFactory(transporter))
                 job.repeat = info.repeat or 0
                 self.scheduler.schedule(job, info.starttime or int(time()))
+                # TODO: remove job from config
+                # TODO: put repeating info in config
+                # TODO: remember last run for repeating job
 
diff --git a/agent/schedule.py b/agent/schedule.py
index 8a3653f..19aea08 100644
--- a/agent/schedule.py
+++ b/agent/schedule.py
@@ -72,11 +72,14 @@ class Job(object):
         # TODO: logging
 
     def finishRun(self, result):
+        # run successors
         for job in self.successors:
             job.params['result'] = result
             job.run(**job.params)
-        # TODO: remove from queue
+        # remove from queue
+        del self.scheduler.queue[self.startTime]
         # TODO: logging
+        # reschedule if necessary
         if self.repeat:
             self.reschedule(int(time() + self.repeat))