small stuff before removing the queues