Remove blocking call from shutdown