diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
index 37b590b061b14..c47caad72aaf5 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
@@ -37,12 +37,6 @@ public class ApplicationRuleCondition extends FirewallPolicyRuleCondition {
     @JsonProperty(value = "protocols")
     private List<FirewallPolicyRuleConditionApplicationProtocol> protocols;
 
-    /**
-     * List of Urls for this rule condition.
-     */
-    @JsonProperty(value = "targetUrls")
-    private List<String> targetUrls;
-
     /**
      * List of FQDNs for this rule condition.
      */
@@ -121,26 +115,6 @@ public ApplicationRuleCondition withProtocols(List<FirewallPolicyRuleConditionAp
         return this;
     }
 
-    /**
-     * Get list of Urls for this rule condition.
-     *
-     * @return the targetUrls value
-     */
-    public List<String> targetUrls() {
-        return this.targetUrls;
-    }
-
-    /**
-     * Set list of Urls for this rule condition.
-     *
-     * @param targetUrls the targetUrls value to set
-     * @return the ApplicationRuleCondition object itself.
-     */
-    public ApplicationRuleCondition withTargetUrls(List<String> targetUrls) {
-        this.targetUrls = targetUrls;
-        return this;
-    }
-
     /**
      * Get list of FQDNs for this rule condition.
      *
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
index 8c9c70be4b662..72cc41b12bdb4 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
@@ -46,16 +46,6 @@ public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource,
      */
     List<SubResource> firewalls();
 
-    /**
-     * @return the identity value.
-     */
-    ManagedServiceIdentity identity();
-
-    /**
-     * @return the intrusionSystemMode value.
-     */
-    FirewallPolicyIntrusionSystemMode intrusionSystemMode();
-
     /**
      * @return the provisioningState value.
      */
@@ -76,11 +66,6 @@ public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource,
      */
     FirewallPolicyThreatIntelWhitelist threatIntelWhitelist();
 
-    /**
-     * @return the transportSecurity value.
-     */
-    FirewallPolicyTransportSecurity transportSecurity();
-
     /**
      * The entirety of the FirewallPolicy definition.
      */
@@ -115,30 +100,6 @@ interface WithBasePolicy {
             WithCreate withBasePolicy(SubResource basePolicy);
         }
 
-        /**
-         * The stage of the firewallpolicy definition allowing to specify Identity.
-         */
-        interface WithIdentity {
-            /**
-             * Specifies identity.
-             * @param identity The identity of the firewall policy
-             * @return the next definition stage
-             */
-            WithCreate withIdentity(ManagedServiceIdentity identity);
-        }
-
-        /**
-         * The stage of the firewallpolicy definition allowing to specify IntrusionSystemMode.
-         */
-        interface WithIntrusionSystemMode {
-            /**
-             * Specifies intrusionSystemMode.
-             * @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
-             * @return the next definition stage
-             */
-            WithCreate withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
-        }
-
         /**
          * The stage of the firewallpolicy definition allowing to specify ThreatIntelMode.
          */
@@ -163,30 +124,18 @@ interface WithThreatIntelWhitelist {
             WithCreate withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
         }
 
-        /**
-         * The stage of the firewallpolicy definition allowing to specify TransportSecurity.
-         */
-        interface WithTransportSecurity {
-            /**
-             * Specifies transportSecurity.
-             * @param transportSecurity TLS Configuration definition
-             * @return the next definition stage
-             */
-            WithCreate withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
-        }
-
         /**
          * The stage of the definition which contains all the minimum required inputs for
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithIdentity, DefinitionStages.WithIntrusionSystemMode, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithThreatIntelWhitelist, DefinitionStages.WithTransportSecurity {
+        interface WithCreate extends Creatable<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithThreatIntelWhitelist {
         }
     }
     /**
      * The template for a FirewallPolicy update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithIdentity, UpdateStages.WithIntrusionSystemMode, UpdateStages.WithThreatIntelMode, UpdateStages.WithThreatIntelWhitelist, UpdateStages.WithTransportSecurity {
+    interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithThreatIntelMode, UpdateStages.WithThreatIntelWhitelist {
     }
 
     /**
@@ -205,30 +154,6 @@ interface WithBasePolicy {
             Update withBasePolicy(SubResource basePolicy);
         }
 
-        /**
-         * The stage of the firewallpolicy update allowing to specify Identity.
-         */
-        interface WithIdentity {
-            /**
-             * Specifies identity.
-             * @param identity The identity of the firewall policy
-             * @return the next update stage
-             */
-            Update withIdentity(ManagedServiceIdentity identity);
-        }
-
-        /**
-         * The stage of the firewallpolicy update allowing to specify IntrusionSystemMode.
-         */
-        interface WithIntrusionSystemMode {
-            /**
-             * Specifies intrusionSystemMode.
-             * @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
-             * @return the next update stage
-             */
-            Update withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
-        }
-
         /**
          * The stage of the firewallpolicy update allowing to specify ThreatIntelMode.
          */
@@ -253,17 +178,5 @@ interface WithThreatIntelWhitelist {
             Update withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
         }
 
-        /**
-         * The stage of the firewallpolicy update allowing to specify TransportSecurity.
-         */
-        interface WithTransportSecurity {
-            /**
-             * Specifies transportSecurity.
-             * @param transportSecurity TLS Configuration definition
-             * @return the next update stage
-             */
-            Update withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
-        }
-
     }
 }
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
index 724830b05bdb0..84c28b8f4b410 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
@@ -18,6 +18,7 @@
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
 import java.util.List;
+import com.microsoft.azure.SubResource;
 
 /**
  * Type representing HubRouteTable.
@@ -26,7 +27,7 @@ public interface HubRouteTable extends HasInner<HubRouteTableInner>, Indexable,
     /**
      * @return the associatedConnections value.
      */
-    List<String> associatedConnections();
+    List<SubResource> associatedConnections();
 
     /**
      * @return the etag value.
@@ -51,7 +52,7 @@ public interface HubRouteTable extends HasInner<HubRouteTableInner>, Indexable,
     /**
      * @return the propagatingConnections value.
      */
-    List<String> propagatingConnections();
+    List<SubResource> propagatingConnections();
 
     /**
      * @return the provisioningState value.
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java
index d71d81827aa4d..9a9a84084b3d3 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java
@@ -49,12 +49,6 @@ public class NatRuleCondition extends FirewallPolicyRuleCondition {
     @JsonProperty(value = "sourceIpGroups")
     private List<String> sourceIpGroups;
 
-    /**
-     * Terminate TLS connections for this rule.
-     */
-    @JsonProperty(value = "terminateTLS")
-    private Boolean terminateTLS;
-
     /**
      * Get array of FirewallPolicyRuleConditionNetworkProtocols.
      *
@@ -155,24 +149,4 @@ public NatRuleCondition withSourceIpGroups(List<String> sourceIpGroups) {
         return this;
     }
 
-    /**
-     * Get terminate TLS connections for this rule.
-     *
-     * @return the terminateTLS value
-     */
-    public Boolean terminateTLS() {
-        return this.terminateTLS;
-    }
-
-    /**
-     * Set terminate TLS connections for this rule.
-     *
-     * @param terminateTLS the terminateTLS value to set
-     * @return the NatRuleCondition object itself.
-     */
-    public NatRuleCondition withTerminateTLS(Boolean terminateTLS) {
-        this.terminateTLS = terminateTLS;
-        return this;
-    }
-
 }
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java
index 8524dbb516671..bf34eae7cbcb9 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyImpl.java
@@ -16,9 +16,6 @@
 import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
 import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallThreatIntelMode;
 import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyThreatIntelWhitelist;
-import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyIntrusionSystemMode;
-import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyTransportSecurity;
-import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
 
 class FirewallPolicyImpl extends GroupableResourceCoreImpl<FirewallPolicy, FirewallPolicyInner, FirewallPolicyImpl, NetworkManager> implements FirewallPolicy, FirewallPolicy.Definition, FirewallPolicy.Update {
     FirewallPolicyImpl(String name, FirewallPolicyInner inner, NetworkManager manager) {
@@ -71,16 +68,6 @@ public List<SubResource> firewalls() {
         return this.inner().firewalls();
     }
 
-    @Override
-    public ManagedServiceIdentity identity() {
-        return this.inner().identity();
-    }
-
-    @Override
-    public FirewallPolicyIntrusionSystemMode intrusionSystemMode() {
-        return this.inner().intrusionSystemMode();
-    }
-
     @Override
     public ProvisioningState provisioningState() {
         return this.inner().provisioningState();
@@ -101,29 +88,12 @@ public FirewallPolicyThreatIntelWhitelist threatIntelWhitelist() {
         return this.inner().threatIntelWhitelist();
     }
 
-    @Override
-    public FirewallPolicyTransportSecurity transportSecurity() {
-        return this.inner().transportSecurity();
-    }
-
     @Override
     public FirewallPolicyImpl withBasePolicy(SubResource basePolicy) {
         this.inner().withBasePolicy(basePolicy);
         return this;
     }
 
-    @Override
-    public FirewallPolicyImpl withIdentity(ManagedServiceIdentity identity) {
-        this.inner().withIdentity(identity);
-        return this;
-    }
-
-    @Override
-    public FirewallPolicyImpl withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode) {
-        this.inner().withIntrusionSystemMode(intrusionSystemMode);
-        return this;
-    }
-
     @Override
     public FirewallPolicyImpl withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode) {
         this.inner().withThreatIntelMode(threatIntelMode);
@@ -136,10 +106,4 @@ public FirewallPolicyImpl withThreatIntelWhitelist(FirewallPolicyThreatIntelWhit
         return this;
     }
 
-    @Override
-    public FirewallPolicyImpl withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity) {
-        this.inner().withTransportSecurity(transportSecurity);
-        return this;
-    }
-
 }
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java
index f28266bd9845a..678e153721eac 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/FirewallPolicyInner.java
@@ -13,9 +13,6 @@
 import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
 import com.microsoft.azure.management.network.v2020_04_01.AzureFirewallThreatIntelMode;
 import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyThreatIntelWhitelist;
-import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyIntrusionSystemMode;
-import com.microsoft.azure.management.network.v2020_04_01.FirewallPolicyTransportSecurity;
-import com.microsoft.azure.management.network.v2020_04_01.ManagedServiceIdentity;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 import com.microsoft.rest.SkipParentValidation;
@@ -72,31 +69,12 @@ public class FirewallPolicyInner extends Resource {
     @JsonProperty(value = "properties.threatIntelWhitelist")
     private FirewallPolicyThreatIntelWhitelist threatIntelWhitelist;
 
-    /**
-     * The operation mode for Intrusion system. Possible values include:
-     * 'Enabled', 'Disabled'.
-     */
-    @JsonProperty(value = "properties.intrusionSystemMode")
-    private FirewallPolicyIntrusionSystemMode intrusionSystemMode;
-
-    /**
-     * TLS Configuration definition.
-     */
-    @JsonProperty(value = "properties.transportSecurity")
-    private FirewallPolicyTransportSecurity transportSecurity;
-
     /**
      * A unique read-only string that changes whenever the resource is updated.
      */
     @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
     private String etag;
 
-    /**
-     * The identity of the firewall policy.
-     */
-    @JsonProperty(value = "identity")
-    private ManagedServiceIdentity identity;
-
     /**
      * Resource ID.
      */
@@ -199,46 +177,6 @@ public FirewallPolicyInner withThreatIntelWhitelist(FirewallPolicyThreatIntelWhi
         return this;
     }
 
-    /**
-     * Get the operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'.
-     *
-     * @return the intrusionSystemMode value
-     */
-    public FirewallPolicyIntrusionSystemMode intrusionSystemMode() {
-        return this.intrusionSystemMode;
-    }
-
-    /**
-     * Set the operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'.
-     *
-     * @param intrusionSystemMode the intrusionSystemMode value to set
-     * @return the FirewallPolicyInner object itself.
-     */
-    public FirewallPolicyInner withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode) {
-        this.intrusionSystemMode = intrusionSystemMode;
-        return this;
-    }
-
-    /**
-     * Get tLS Configuration definition.
-     *
-     * @return the transportSecurity value
-     */
-    public FirewallPolicyTransportSecurity transportSecurity() {
-        return this.transportSecurity;
-    }
-
-    /**
-     * Set tLS Configuration definition.
-     *
-     * @param transportSecurity the transportSecurity value to set
-     * @return the FirewallPolicyInner object itself.
-     */
-    public FirewallPolicyInner withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity) {
-        this.transportSecurity = transportSecurity;
-        return this;
-    }
-
     /**
      * Get a unique read-only string that changes whenever the resource is updated.
      *
@@ -248,26 +186,6 @@ public String etag() {
         return this.etag;
     }
 
-    /**
-     * Get the identity of the firewall policy.
-     *
-     * @return the identity value
-     */
-    public ManagedServiceIdentity identity() {
-        return this.identity;
-    }
-
-    /**
-     * Set the identity of the firewall policy.
-     *
-     * @param identity the identity value to set
-     * @return the FirewallPolicyInner object itself.
-     */
-    public FirewallPolicyInner withIdentity(ManagedServiceIdentity identity) {
-        this.identity = identity;
-        return this;
-    }
-
     /**
      * Get resource ID.
      *
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java
index 591c5f2c01ba0..8f5b23be7922e 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java
@@ -13,6 +13,7 @@
 import rx.Observable;
 import java.util.List;
 import com.microsoft.azure.management.network.v2020_04_01.HubRoute;
+import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
 
 class HubRouteTableImpl extends CreatableUpdatableImpl<HubRouteTable, HubRouteTableInner, HubRouteTableImpl> implements HubRouteTable, HubRouteTable.Definition, HubRouteTable.Update {
@@ -73,7 +74,7 @@ public boolean isInCreateMode() {
 
 
     @Override
-    public List<String> associatedConnections() {
+    public List<SubResource> associatedConnections() {
         return this.inner().associatedConnections();
     }
 
@@ -98,7 +99,7 @@ public String name() {
     }
 
     @Override
-    public List<String> propagatingConnections() {
+    public List<SubResource> propagatingConnections() {
         return this.inner().propagatingConnections();
     }
 
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java
index 20f734ec8e8a1..1917dbc0e8b02 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java
@@ -10,10 +10,10 @@
 
 import java.util.List;
 import com.microsoft.azure.management.network.v2020_04_01.HubRoute;
+import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
-import com.microsoft.azure.SubResource;
 
 /**
  * RouteTable resource in a virtual hub.
@@ -36,13 +36,13 @@ public class HubRouteTableInner extends SubResource {
      * List of all connections associated with this route table.
      */
     @JsonProperty(value = "properties.associatedConnections", access = JsonProperty.Access.WRITE_ONLY)
-    private List<String> associatedConnections;
+    private List<SubResource> associatedConnections;
 
     /**
      * List of all connections that advertise to this route table.
      */
     @JsonProperty(value = "properties.propagatingConnections", access = JsonProperty.Access.WRITE_ONLY)
-    private List<String> propagatingConnections;
+    private List<SubResource> propagatingConnections;
 
     /**
      * The provisioning state of the RouteTable resource. Possible values
@@ -115,7 +115,7 @@ public HubRouteTableInner withLabels(List<String> labels) {
      *
      * @return the associatedConnections value
      */
-    public List<String> associatedConnections() {
+    public List<SubResource> associatedConnections() {
         return this.associatedConnections;
     }
 
@@ -124,7 +124,7 @@ public List<String> associatedConnections() {
      *
      * @return the propagatingConnections value
      */
-    public List<String> propagatingConnections() {
+    public List<SubResource> propagatingConnections() {
         return this.propagatingConnections;
     }
 
diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java
index 63e521d112331..941f0618361f9 100644
--- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java
+++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/PrivateLinkServicesInner.java
@@ -40,8 +40,6 @@
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
-import com.microsoft.azure.LongRunningFinalState;
-import com.microsoft.azure.LongRunningOperationOptions;
 
 /**
  * An instance of this class provides access to all the operations defined
@@ -121,18 +119,10 @@ interface PrivateLinkServicesService {
         @POST("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/checkPrivateLinkServiceVisibility")
         Observable<Response<ResponseBody>> checkPrivateLinkServiceVisibility(@Path("location") String location, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckPrivateLinkServiceVisibilityRequest parameters, @Header("User-Agent") String userAgent);
 
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices beginCheckPrivateLinkServiceVisibility" })
-        @POST("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/checkPrivateLinkServiceVisibility")
-        Observable<Response<ResponseBody>> beginCheckPrivateLinkServiceVisibility(@Path("location") String location, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckPrivateLinkServiceVisibilityRequest parameters, @Header("User-Agent") String userAgent);
-
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices checkPrivateLinkServiceVisibilityByResourceGroup" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/checkPrivateLinkServiceVisibility")
         Observable<Response<ResponseBody>> checkPrivateLinkServiceVisibilityByResourceGroup(@Path("location") String location, @Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckPrivateLinkServiceVisibilityRequest parameters, @Header("User-Agent") String userAgent);
 
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices beginCheckPrivateLinkServiceVisibilityByResourceGroup" })
-        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/checkPrivateLinkServiceVisibility")
-        Observable<Response<ResponseBody>> beginCheckPrivateLinkServiceVisibilityByResourceGroup(@Path("location") String location, @Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckPrivateLinkServiceVisibilityRequest parameters, @Header("User-Agent") String userAgent);
-
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2020_04_01.PrivateLinkServices listAutoApprovedPrivateLinkServices" })
         @GET("subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/autoApprovedPrivateLinkServices")
         Observable<Response<ResponseBody>> listAutoApprovedPrivateLinkServices(@Path("location") String location, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -1441,7 +1431,7 @@ private ServiceResponse<PageImpl<PrivateEndpointConnectionInner>> listPrivateEnd
      * @return the PrivateLinkServiceVisibilityInner object if successful.
      */
     public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibility(String location) {
-        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location).toBlocking().last().body();
+        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location).toBlocking().single().body();
     }
 
     /**
@@ -1461,7 +1451,7 @@ public ServiceFuture<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceV
      *
      * @param location The location of the domain name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
     public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location) {
         return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
@@ -1472,134 +1462,6 @@ public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkService
         });
     }
 
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityWithServiceResponseAsync(String location) {
-        if (location == null) {
-            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
-        }
-        final String apiVersion = "2020-04-01";
-        final String privateLinkServiceAlias = null;
-        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
-        parameters.withPrivateLinkServiceAlias(null);
-        Observable<Response<ResponseBody>> observable = service.checkPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType());
-    }
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PrivateLinkServiceVisibilityInner object if successful.
-     */
-    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibility(String location, String privateLinkServiceAlias) {
-        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).toBlocking().last().body();
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the {@link ServiceFuture} object
-     */
-    public ServiceFuture<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
-        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias), serviceCallback);
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias) {
-        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
-            @Override
-            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityWithServiceResponseAsync(String location, String privateLinkServiceAlias) {
-        if (location == null) {
-            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
-        }
-        final String apiVersion = "2020-04-01";
-        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
-        parameters.withPrivateLinkServiceAlias(privateLinkServiceAlias);
-        Observable<Response<ResponseBody>> observable = service.checkPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType());
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PrivateLinkServiceVisibilityInner object if successful.
-     */
-    public PrivateLinkServiceVisibilityInner beginCheckPrivateLinkServiceVisibility(String location) {
-        return beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(location).toBlocking().single().body();
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the {@link ServiceFuture} object
-     */
-    public ServiceFuture<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityAsync(String location, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
-        return ServiceFuture.fromResponse(beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(location), serviceCallback);
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service.
-     *
-     * @param location The location of the domain name.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PrivateLinkServiceVisibilityInner object
-     */
-    public Observable<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityAsync(String location) {
-        return beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(location).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
-            @Override
-            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
-                return response.body();
-            }
-        });
-    }
-
     /**
      * Checks whether the subscription is visible to private link service.
      *
@@ -1607,7 +1469,7 @@ public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkService
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(String location) {
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityWithServiceResponseAsync(String location) {
         if (location == null) {
             throw new IllegalArgumentException("Parameter location is required and cannot be null.");
         }
@@ -1618,12 +1480,12 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheck
         final String privateLinkServiceAlias = null;
         CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
         parameters.withPrivateLinkServiceAlias(null);
-        return service.beginCheckPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+        return service.checkPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
                 @Override
                 public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = beginCheckPrivateLinkServiceVisibilityDelegate(response);
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1642,8 +1504,8 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Respo
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PrivateLinkServiceVisibilityInner object if successful.
      */
-    public PrivateLinkServiceVisibilityInner beginCheckPrivateLinkServiceVisibility(String location, String privateLinkServiceAlias) {
-        return beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).toBlocking().single().body();
+    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibility(String location, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).toBlocking().single().body();
     }
 
     /**
@@ -1655,8 +1517,8 @@ public PrivateLinkServiceVisibilityInner beginCheckPrivateLinkServiceVisibility(
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
-        return ServiceFuture.fromResponse(beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias), serviceCallback);
+    public ServiceFuture<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias), serviceCallback);
     }
 
     /**
@@ -1667,8 +1529,8 @@ public ServiceFuture<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkSer
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
-    public Observable<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias) {
-        return beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
+    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityAsync(String location, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityWithServiceResponseAsync(location, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
             @Override
             public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
                 return response.body();
@@ -1684,7 +1546,7 @@ public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkService
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheckPrivateLinkServiceVisibilityWithServiceResponseAsync(String location, String privateLinkServiceAlias) {
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityWithServiceResponseAsync(String location, String privateLinkServiceAlias) {
         if (location == null) {
             throw new IllegalArgumentException("Parameter location is required and cannot be null.");
         }
@@ -1694,12 +1556,12 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheck
         final String apiVersion = "2020-04-01";
         CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
         parameters.withPrivateLinkServiceAlias(privateLinkServiceAlias);
-        return service.beginCheckPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+        return service.checkPrivateLinkServiceVisibility(location, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
                 @Override
                 public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = beginCheckPrivateLinkServiceVisibilityDelegate(response);
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1708,10 +1570,9 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Respo
             });
     }
 
-    private ServiceResponse<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+    private ServiceResponse<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<PrivateLinkServiceVisibilityInner, CloudException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType())
-                .register(202, new TypeToken<Void>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1727,7 +1588,7 @@ private ServiceResponse<PrivateLinkServiceVisibilityInner> beginCheckPrivateLink
      * @return the PrivateLinkServiceVisibilityInner object if successful.
      */
     public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibilityByResourceGroup(String location, String resourceGroupName) {
-        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName).toBlocking().last().body();
+        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName).toBlocking().single().body();
     }
 
     /**
@@ -1749,7 +1610,7 @@ public ServiceFuture<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceV
      * @param location The location of the domain name.
      * @param resourceGroupName The name of the resource group.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
+     * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
     public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName) {
         return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
@@ -1760,148 +1621,6 @@ public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkService
         });
     }
 
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName) {
-        if (location == null) {
-            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
-        }
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
-        }
-        final String apiVersion = "2020-04-01";
-        final String privateLinkServiceAlias = null;
-        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
-        parameters.withPrivateLinkServiceAlias(null);
-        Observable<Response<ResponseBody>> observable = service.checkPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType());
-    }
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PrivateLinkServiceVisibilityInner object if successful.
-     */
-    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibilityByResourceGroup(String location, String resourceGroupName, String privateLinkServiceAlias) {
-        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).toBlocking().last().body();
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the {@link ServiceFuture} object
-     */
-    public ServiceFuture<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
-        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias), serviceCallback);
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
-        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
-            @Override
-            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @param privateLinkServiceAlias The alias of the private link service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
-        if (location == null) {
-            throw new IllegalArgumentException("Parameter location is required and cannot be null.");
-        }
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
-        }
-        final String apiVersion = "2020-04-01";
-        CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
-        parameters.withPrivateLinkServiceAlias(privateLinkServiceAlias);
-        Observable<Response<ResponseBody>> observable = service.checkPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType());
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PrivateLinkServiceVisibilityInner object if successful.
-     */
-    public PrivateLinkServiceVisibilityInner beginCheckPrivateLinkServiceVisibilityByResourceGroup(String location, String resourceGroupName) {
-        return beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName).toBlocking().single().body();
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the {@link ServiceFuture} object
-     */
-    public ServiceFuture<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
-        return ServiceFuture.fromResponse(beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName), serviceCallback);
-    }
-
-    /**
-     * Checks whether the subscription is visible to private link service in the specified resource group.
-     *
-     * @param location The location of the domain name.
-     * @param resourceGroupName The name of the resource group.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PrivateLinkServiceVisibilityInner object
-     */
-    public Observable<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName) {
-        return beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
-            @Override
-            public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
-                return response.body();
-            }
-        });
-    }
-
     /**
      * Checks whether the subscription is visible to private link service in the specified resource group.
      *
@@ -1910,7 +1629,7 @@ public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkService
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName) {
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName) {
         if (location == null) {
             throw new IllegalArgumentException("Parameter location is required and cannot be null.");
         }
@@ -1924,12 +1643,12 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheck
         final String privateLinkServiceAlias = null;
         CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
         parameters.withPrivateLinkServiceAlias(null);
-        return service.beginCheckPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+        return service.checkPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
                 @Override
                 public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = beginCheckPrivateLinkServiceVisibilityByResourceGroupDelegate(response);
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityByResourceGroupDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1949,8 +1668,8 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Respo
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PrivateLinkServiceVisibilityInner object if successful.
      */
-    public PrivateLinkServiceVisibilityInner beginCheckPrivateLinkServiceVisibilityByResourceGroup(String location, String resourceGroupName, String privateLinkServiceAlias) {
-        return beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).toBlocking().single().body();
+    public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibilityByResourceGroup(String location, String resourceGroupName, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).toBlocking().single().body();
     }
 
     /**
@@ -1963,8 +1682,8 @@ public PrivateLinkServiceVisibilityInner beginCheckPrivateLinkServiceVisibilityB
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
-        return ServiceFuture.fromResponse(beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias), serviceCallback);
+    public ServiceFuture<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias, final ServiceCallback<PrivateLinkServiceVisibilityInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias), serviceCallback);
     }
 
     /**
@@ -1976,8 +1695,8 @@ public ServiceFuture<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkSer
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
-    public Observable<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
-        return beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
+    public Observable<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
+        return checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(location, resourceGroupName, privateLinkServiceAlias).map(new Func1<ServiceResponse<PrivateLinkServiceVisibilityInner>, PrivateLinkServiceVisibilityInner>() {
             @Override
             public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkServiceVisibilityInner> response) {
                 return response.body();
@@ -1994,7 +1713,7 @@ public PrivateLinkServiceVisibilityInner call(ServiceResponse<PrivateLinkService
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PrivateLinkServiceVisibilityInner object
      */
-    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheckPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
+    public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> checkPrivateLinkServiceVisibilityByResourceGroupWithServiceResponseAsync(String location, String resourceGroupName, String privateLinkServiceAlias) {
         if (location == null) {
             throw new IllegalArgumentException("Parameter location is required and cannot be null.");
         }
@@ -2007,12 +1726,12 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> beginCheck
         final String apiVersion = "2020-04-01";
         CheckPrivateLinkServiceVisibilityRequest parameters = new CheckPrivateLinkServiceVisibilityRequest();
         parameters.withPrivateLinkServiceAlias(privateLinkServiceAlias);
-        return service.beginCheckPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
+        return service.checkPrivateLinkServiceVisibilityByResourceGroup(location, resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), parameters, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>>>() {
                 @Override
                 public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = beginCheckPrivateLinkServiceVisibilityByResourceGroupDelegate(response);
+                        ServiceResponse<PrivateLinkServiceVisibilityInner> clientResponse = checkPrivateLinkServiceVisibilityByResourceGroupDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2021,10 +1740,9 @@ public Observable<ServiceResponse<PrivateLinkServiceVisibilityInner>> call(Respo
             });
     }
 
-    private ServiceResponse<PrivateLinkServiceVisibilityInner> beginCheckPrivateLinkServiceVisibilityByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+    private ServiceResponse<PrivateLinkServiceVisibilityInner> checkPrivateLinkServiceVisibilityByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<PrivateLinkServiceVisibilityInner, CloudException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PrivateLinkServiceVisibilityInner>() { }.getType())
-                .register(202, new TypeToken<Void>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }