Fix cleanup of parallel queues