Clean up of code after bug fix for creating workers
More clean up