Moved thread enders to ShutdownService