Clean up messaging integs that assumed queue.stop was synchronous