Feature/amqp cleanup