Fixed bug in removing queue from broker when it is deleted