diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/Adapters/ProxyResource.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/Adapters/ProxyResource.cs
deleted file mode 100644
index 06d82c00de469..0000000000000
--- a/sdk/resourcemanager/Azure.ResourceManager.Core/src/Adapters/ProxyResource.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-namespace Azure.ResourceManager.Core
-{
-    /// <summary>
-    /// A class representing a generic proxy resource in Azure
-    /// </summary>
-    /// <typeparam name="TModel"> The type of the underlying model this class wraps </typeparam>
-    /// <typeparam name="TIdentifier"> The type of the underlying modelresource Id </typeparam>
-    public abstract class ProxyResource<TIdentifier, TModel> : Resource<TIdentifier>
-        where TModel : class
-        where TIdentifier : TenantResourceIdentifier
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyResource{TModel, TIdentifier}"/> class.
-        /// </summary>
-        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
-        /// <param name="data"> The model to copy from. </param>
-        protected ProxyResource(TIdentifier id, TModel data)
-            : base(id, id?.Name, id?.ResourceType)
-        {
-            Model = data;
-        }
-
-        /// <summary>
-        /// Gets or sets the Model this resource is based off.
-        /// </summary>
-        public virtual TModel Model { get; set; }
-
-        /// <summary>
-        /// Converts from a <see cref="ProxyResource{TModel, TIdentifier}"/> into the TModel.
-        /// </summary>
-        /// <param name="other"> The tracked resource convert from. </param>
-        public static implicit operator TModel(ProxyResource<TIdentifier, TModel> other)
-        {
-            return other.Model;
-        }
-    }
-}
diff --git a/sdk/resourcemanager/Proto.Client/network/Placeholder/SubnetData.cs b/sdk/resourcemanager/Proto.Client/network/Placeholder/SubnetData.cs
index aa8a1d22ca655..9a7cefb7c9377 100644
--- a/sdk/resourcemanager/Proto.Client/network/Placeholder/SubnetData.cs
+++ b/sdk/resourcemanager/Proto.Client/network/Placeholder/SubnetData.cs
@@ -7,17 +7,24 @@ namespace Proto.Network
     /// <summary>
     /// A class representing the subnet data model.
     /// </summary>
-    public class SubnetData : ProxyResource<ResourceGroupResourceIdentifier, Azure.ResourceManager.Network.Models.Subnet>
+    public class SubnetData : Resource<ResourceGroupResourceIdentifier>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SubnetData"/> class.
         /// </summary>
-        public SubnetData(Azure.ResourceManager.Network.Models.Subnet sub) : base(sub.Id, sub)
+        public SubnetData(Azure.ResourceManager.Network.Models.Subnet sub) 
+            : base(sub.Id, sub.Name, SubnetOperations.ResourceType)
         {
+            Model = sub;
         }
 
         /// <summary>
-        /// Gets the subnet id.
+        /// Gets or sets the Model this resource is based of. 
+        ///</summary>
+        public virtual Azure.ResourceManager.Network.Models.Subnet Model { get; set; }
+
+        /// <summary>
+        /// Gets the subnet id. 
         ///</summary>
         public override string Name => Model.Name;