add cancel for unused queues
upstream changes