rework subtask batching again
remove unnecessary celery grouping