Remove cleanup_tasks, as it's not stable