Removed reference to queues