Re-order
Remove dependency on AMQP 1.0