Fixing Queue.remove