Currently we are running shutdown on a DispatchQueue. We should an async function for this now and avoid any reference to Dispatch.