Moved delayed tasks to something that is concurrent-safe and allows removal