rework some of the amqp management