Added automatic removal of orphaned queues