Amqp changes

Simplify amqp handling