Fix delete

Fix deletion for queue and exchange