Remove the queue as it's not really needed