add methods to clean up queues on destroy