Removing async calls due to race conditions they create (mainly errors on shutdown...