More work on worker
More work on removing celery