Clean up of worker handling