Migrating to Azure SDK 2.1

Migrated to Azure SDK 2.1, slightly simplified code