refactor out the riak part , prepr fo rabbitmq