Taking Azure analytics out
Fixed merge issue