Cleanup in worker.hxx