diff --git a/containerservice/resource-manager/v2019_06_01/pom.xml b/containerservice/resource-manager/v2019_06_01/pom.xml
index 1c11b07d0195..37f51c5b0a95 100644
--- a/containerservice/resource-manager/v2019_06_01/pom.xml
+++ b/containerservice/resource-manager/v2019_06_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerservice</artifactId>
     <version>1.0.0-beta</version>
@@ -71,8 +71,6 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
-            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java
index c18b5d4d7615..898c7bf7f7b6 100644
--- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java
@@ -15,7 +15,7 @@
 /**
  * Defines the Identity provider for MS AAD.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind", defaultImpl = OpenShiftManagedClusterAADIdentityProvider.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("AADIdentityProvider")
 public class OpenShiftManagedClusterAADIdentityProvider extends OpenShiftManagedClusterBaseIdentityProvider {
     /**
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java
index 2c6e011105ef..524c75a6ff47 100644
--- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java
@@ -15,7 +15,7 @@
 /**
  * Structure for any Identity provider.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind", defaultImpl = OpenShiftManagedClusterBaseIdentityProvider.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("OpenShiftManagedClusterBaseIdentityProvider")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "AADIdentityProvider", value = OpenShiftManagedClusterAADIdentityProvider.class)
diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java
index 911bee5b30f7..fb8135fb6485 100644
--- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java
+++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java
@@ -66,14 +66,10 @@ public AgentPool call(AgentPoolInner inner) {
     public Observable<AgentPool> getAsync(String resourceGroupName, String resourceName, String agentPoolName) {
         AgentPoolsInner client = this.inner();
         return client.getAsync(resourceGroupName, resourceName, agentPoolName)
-        .flatMap(new Func1<AgentPoolInner, Observable<AgentPool>>() {
+        .map(new Func1<AgentPoolInner, AgentPool>() {
             @Override
-            public Observable<AgentPool> call(AgentPoolInner inner) {
-                if (inner == null) {
-                    return Observable.empty();
-                } else {
-                    return Observable.just((AgentPool)wrapModel(inner));
-                }
+            public AgentPool call(AgentPoolInner inner) {
+                return wrapModel(inner);
             }
        });
     }