modified to remove amqp