Adjust the way queues are deleted