removing amqp and rafactoring