amqp: More cleanup