added removal option for queues