Change so that queue is actually removed