Moved thread joining on shutdown to WorkerThread