Get rid of the queueing stuff