cloud stuff and more (c#6 cleanup)