diff --git a/eng/ApiListing.exclude-attributes.txt b/eng/ApiListing.exclude-attributes.txt
index cd890199bf46..b21c0c45c897 100644
--- a/eng/ApiListing.exclude-attributes.txt
+++ b/eng/ApiListing.exclude-attributes.txt
@@ -2,4 +2,5 @@ T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
 T:System.Runtime.CompilerServices.AsyncStateMachineAttribute
 T:System.Runtime.CompilerServices.CompilerGeneratedAttribute
 T:System.Runtime.CompilerServices.NullableContextAttribute
-T:System.Runtime.CompilerServices.NullableAttribute
\ No newline at end of file
+T:System.Runtime.CompilerServices.NullableAttribute
+T:Azure.Core.CodeGenSuppressAttribute
\ No newline at end of file
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 2407c31c0363..0e9111209adc 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -131,7 +131,7 @@
     All should have PrivateAssets="All" set so they don't become pacakge dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210624.1" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210628.2" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20210322.2" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
diff --git a/sdk/attestation/Azure.Security.Attestation/api/Azure.Security.Attestation.netstandard2.0.cs b/sdk/attestation/Azure.Security.Attestation/api/Azure.Security.Attestation.netstandard2.0.cs
index 774f94ecdeff..823be79786f8 100644
--- a/sdk/attestation/Azure.Security.Attestation/api/Azure.Security.Attestation.netstandard2.0.cs
+++ b/sdk/attestation/Azure.Security.Attestation/api/Azure.Security.Attestation.netstandard2.0.cs
@@ -223,10 +223,6 @@ public event Azure.Core.SyncAsyncEventHandler<Azure.Security.Attestation.Attesta
         public static bool operator !=(Azure.Security.Attestation.AttestationType left, Azure.Security.Attestation.AttestationType right) { throw null; }
         public override string ToString() { throw null; }
     }
-    public static partial class AzureSecurityAttestationModelFactory
-    {
-        public static Azure.Security.Attestation.TpmAttestationResponse TpmAttestationResponse(string internalData = null) { throw null; }
-    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct PolicyCertificateResolution : System.IEquatable<Azure.Security.Attestation.PolicyCertificateResolution>
     {
diff --git a/sdk/attestation/Azure.Security.Attestation/src/Generated/AzureSecurityAttestationModelFactory.cs b/sdk/attestation/Azure.Security.Attestation/src/Generated/AzureSecurityAttestationModelFactory.cs
deleted file mode 100644
index 513e5b2818af..000000000000
--- a/sdk/attestation/Azure.Security.Attestation/src/Generated/AzureSecurityAttestationModelFactory.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-namespace Azure.Security.Attestation
-{
-    /// <summary> Model factory for read-only models. </summary>
-    public static partial class AzureSecurityAttestationModelFactory
-    {
-        /// <summary> Initializes new instance of TpmAttestationResponse class. </summary>
-        /// <param name="internalData"> Protocol data containing attestation service response. </param>
-        /// <returns> A new <see cref="Attestation.TpmAttestationResponse"/> instance for mocking. </returns>
-        public static TpmAttestationResponse TpmAttestationResponse(string internalData = default)
-        {
-            return new TpmAttestationResponse(internalData);
-        }
-    }
-}
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/api/Azure.Containers.ContainerRegistry.netstandard2.0.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/api/Azure.Containers.ContainerRegistry.netstandard2.0.cs
index 4e4fa1656164..94da344c9ba0 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/api/Azure.Containers.ContainerRegistry.netstandard2.0.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/api/Azure.Containers.ContainerRegistry.netstandard2.0.cs
@@ -137,7 +137,6 @@ public enum ServiceVersion
     public static partial class ContainerRegistryModelFactory
     {
         public static Azure.Containers.ContainerRegistry.ArtifactManifestPlatform ArtifactManifestPlatform(string digest = null, Azure.Containers.ContainerRegistry.ArtifactArchitecture? architecture = default(Azure.Containers.ContainerRegistry.ArtifactArchitecture?), Azure.Containers.ContainerRegistry.ArtifactOperatingSystem? operatingSystem = default(Azure.Containers.ContainerRegistry.ArtifactOperatingSystem?)) { throw null; }
-        public static Azure.Containers.ContainerRegistry.ArtifactManifestProperties ArtifactManifestProperties(string registryLoginServer = null, string repositoryName = null, string digest = null, long? size = default(long?), System.DateTimeOffset createdOn = default(System.DateTimeOffset), System.DateTimeOffset lastUpdatedOn = default(System.DateTimeOffset), Azure.Containers.ContainerRegistry.ArtifactArchitecture? architecture = default(Azure.Containers.ContainerRegistry.ArtifactArchitecture?), Azure.Containers.ContainerRegistry.ArtifactOperatingSystem? operatingSystem = default(Azure.Containers.ContainerRegistry.ArtifactOperatingSystem?), System.Collections.Generic.IReadOnlyList<Azure.Containers.ContainerRegistry.ArtifactManifestPlatform> relatedArtifacts = null, System.Collections.Generic.IReadOnlyList<string> tags = null, bool? canDelete = default(bool?), bool? canWrite = default(bool?), bool? canList = default(bool?), bool? canRead = default(bool?), string quarantineState = null, string quarantineDetails = null) { throw null; }
         public static Azure.Containers.ContainerRegistry.ArtifactTagProperties ArtifactTagProperties(string registryLoginServer = null, string repositoryName = null, string name = null, string digest = null, System.DateTimeOffset createdOn = default(System.DateTimeOffset), System.DateTimeOffset lastUpdatedOn = default(System.DateTimeOffset), bool? canDelete = default(bool?), bool? canWrite = default(bool?), bool? canList = default(bool?), bool? canRead = default(bool?)) { throw null; }
         public static Azure.Containers.ContainerRegistry.ContainerRepositoryProperties ContainerRepositoryProperties(string registryLoginServer = null, string name = null, System.DateTimeOffset createdOn = default(System.DateTimeOffset), System.DateTimeOffset lastUpdatedOn = default(System.DateTimeOffset), int manifestCount = 0, int tagCount = 0, bool? canDelete = default(bool?), bool? canWrite = default(bool?), bool? canList = default(bool?), bool? canRead = default(bool?), bool? teleportEnabled = default(bool?)) { throw null; }
     }
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs
index bc0156a7d61a..872a2737abca 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Generated/ContainerRegistryModelFactory.cs
@@ -6,7 +6,6 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
 
 namespace Azure.Containers.ContainerRegistry
 {
@@ -57,30 +56,5 @@ public static ArtifactManifestPlatform ArtifactManifestPlatform(string digest =
         {
             return new ArtifactManifestPlatform(digest, architecture, operatingSystem);
         }
-
-        /// <summary> Initializes new instance of ArtifactManifestProperties class. </summary>
-        /// <param name="registryLoginServer"> Registry login server name.  This is likely to be similar to {registry-name}.azurecr.io. </param>
-        /// <param name="repositoryName"> Repository name. </param>
-        /// <param name="digest"> Manifest. </param>
-        /// <param name="size"> Image size. </param>
-        /// <param name="createdOn"> Created time. </param>
-        /// <param name="lastUpdatedOn"> Last update time. </param>
-        /// <param name="architecture"> CPU architecture. </param>
-        /// <param name="operatingSystem"> Operating system. </param>
-        /// <param name="relatedArtifacts"> List of artifacts that are referenced by this manifest list, with information about the platform each supports.  This list will be empty if this is a leaf manifest and not a manifest list. </param>
-        /// <param name="tags"> List of tags. </param>
-        /// <param name="canDelete"> Delete enabled. </param>
-        /// <param name="canWrite"> Write enabled. </param>
-        /// <param name="canList"> List enabled. </param>
-        /// <param name="canRead"> Read enabled. </param>
-        /// <param name="quarantineState"> Quarantine state. </param>
-        /// <param name="quarantineDetails"> Quarantine details. </param>
-        /// <returns> A new <see cref="ContainerRegistry.ArtifactManifestProperties"/> instance for mocking. </returns>
-        public static ArtifactManifestProperties ArtifactManifestProperties(string registryLoginServer = default, string repositoryName = default, string digest = default, long? size = default, DateTimeOffset createdOn = default, DateTimeOffset lastUpdatedOn = default, ArtifactArchitecture? architecture = default, ArtifactOperatingSystem? operatingSystem = default, IReadOnlyList<ArtifactManifestPlatform> relatedArtifacts = default, IReadOnlyList<string> tags = default, bool? canDelete = default, bool? canWrite = default, bool? canList = default, bool? canRead = default, string quarantineState = default, string quarantineDetails = default)
-        {
-            relatedArtifacts ??= new List<ArtifactManifestPlatform>();
-            tags ??= new List<string>();
-            return new ArtifactManifestProperties(registryLoginServer, repositoryName, digest, size, createdOn, lastUpdatedOn, architecture, operatingSystem, relatedArtifacts, tags, canDelete, canWrite, canList, canRead, quarantineState, quarantineDetails);
-        }
     }
 }
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs
index 29c22c93eb13..30ec3024f650 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs
@@ -8,15 +8,6 @@
 
 namespace Azure.Messaging.EventGrid
 {
-    [CodeGenSuppress("ResourceWriteFailureEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceWriteSuccessEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceWriteCancelEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceDeleteFailureEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceDeleteSuccessEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceDeleteCancelEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceActionSuccessEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceActionFailureEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
-    [CodeGenSuppress("ResourceActionCancelEventData", typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(JsonElement), typeof(JsonElement), typeof(string), typeof(JsonElement))]
 #pragma warning disable CA1054 // URI-like parameters should not be strings
     public static partial class EventGridModelFactory
     {
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs
index bb4915a94fac..5a47c472495b 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs
@@ -7,7 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text.Json;
 using Azure.Messaging.EventGrid.SystemEvents;
 
 namespace Azure.Messaging.EventGrid
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2ModelFactory.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2ModelFactory.cs
index 4218899efd81..7d855c5ed93b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2ModelFactory.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Generated/MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2ModelFactory.cs
@@ -14,29 +14,6 @@ namespace Azure.AI.MetricsAdvisor
     /// <summary> Model factory for read-only models. </summary>
     internal static partial class MicrosoftAzureMetricsAdvisorRestAPIOpenAPIV2ModelFactory
     {
-        /// <summary> Initializes new instance of AnomalyAlertConfiguration class. </summary>
-        /// <param name="id"> anomaly alerting configuration unique id. </param>
-        /// <param name="name"> anomaly alerting configuration name. </param>
-        /// <param name="description"> anomaly alerting configuration description. </param>
-        /// <param name="crossMetricsOperator">
-        /// cross metrics operator
-        /// 
-        /// 
-        /// 
-        /// should be specified when setting up multiple metric alerting configurations.
-        /// </param>
-        /// <param name="splitAlertByDimensions"> dimensions used to split alert. </param>
-        /// <param name="idsOfHooksToAlert"> hook unique ids. </param>
-        /// <param name="metricAlertConfigurations"> Anomaly alerting configurations. </param>
-        /// <returns> A new <see cref="Models.AnomalyAlertConfiguration"/> instance for mocking. </returns>
-        public static AnomalyAlertConfiguration AnomalyAlertConfiguration(string id = default, string name = default, string description = default, MetricAnomalyAlertConfigurationsOperator? crossMetricsOperator = default, IList<string> splitAlertByDimensions = default, IList<string> idsOfHooksToAlert = default, IList<MetricAlertConfiguration> metricAlertConfigurations = default)
-        {
-            splitAlertByDimensions ??= new List<string>();
-            idsOfHooksToAlert ??= new List<string>();
-            metricAlertConfigurations ??= new List<MetricAlertConfiguration>();
-            return new AnomalyAlertConfiguration(id, name, description, crossMetricsOperator, splitAlertByDimensions, idsOfHooksToAlert, metricAlertConfigurations);
-        }
-
         /// <summary> Initializes new instance of AnomalyAlert class. </summary>
         /// <param name="id"> alert id. </param>
         /// <param name="timestamp"> anomaly time. </param>
@@ -114,28 +91,6 @@ public static DataFeedIngestionProgress DataFeedIngestionProgress(DateTimeOffset
             return new DataFeedIngestionProgress(latestSuccessTimestamp, latestActiveTimestamp);
         }
 
-        /// <summary> Initializes new instance of MetricSeriesData class. </summary>
-        /// <param name="definition"> . </param>
-        /// <param name="timestamps"> timestamps of the data related to this time series. </param>
-        /// <param name="metricValues"> values of the data related to this time series. </param>
-        /// <returns> A new <see cref="Models.MetricSeriesData"/> instance for mocking. </returns>
-        public static MetricSeriesData MetricSeriesData(MetricSeriesDefinition definition = default, IReadOnlyList<DateTimeOffset> timestamps = default, IReadOnlyList<double> metricValues = default)
-        {
-            timestamps ??= new List<DateTimeOffset>();
-            metricValues ??= new List<double>();
-            return new MetricSeriesData(definition, timestamps, metricValues);
-        }
-
-        /// <summary> Initializes new instance of MetricSeriesDefinition class. </summary>
-        /// <param name="metricId"> metric unique id. </param>
-        /// <param name="dimension"> dimension name and value pair. </param>
-        /// <returns> A new <see cref="Models.MetricSeriesDefinition"/> instance for mocking. </returns>
-        public static MetricSeriesDefinition MetricSeriesDefinition(string metricId = default, IReadOnlyDictionary<string, string> dimension = default)
-        {
-            dimension ??= new Dictionary<string, string>();
-            return new MetricSeriesDefinition(metricId, dimension);
-        }
-
         /// <summary> Initializes new instance of EnrichmentStatus class. </summary>
         /// <param name="timestamp"> data slice timestamp. </param>
         /// <param name="status"> latest enrichment status for this data slice. </param>
diff --git a/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs b/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs
index 655e95d263fc..4f9b69eb4039 100644
--- a/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs
+++ b/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs
@@ -70,11 +70,8 @@ public MetricsQueryOptions() { }
     }
     public static partial class QueryModelFactory
     {
-        public static Azure.Monitor.Query.Models.LogsQueryResult LogsQueryResult(System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsQueryResultTable> tables = null, System.Text.Json.JsonElement Statistics = default(System.Text.Json.JsonElement), System.Text.Json.JsonElement Visualization = default(System.Text.Json.JsonElement), System.Text.Json.JsonElement Error = default(System.Text.Json.JsonElement)) { throw null; }
         public static Azure.Monitor.Query.Models.LogsQueryResultColumn LogsQueryResultColumn(string name = null, Azure.Monitor.Query.Models.LogsColumnType type = default(Azure.Monitor.Query.Models.LogsColumnType)) { throw null; }
-        public static Azure.Monitor.Query.Models.LogsQueryResultTable LogsQueryResultTable(string name = null, System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsQueryResultColumn> columns = null, System.Text.Json.JsonElement internalRows = default(System.Text.Json.JsonElement)) { throw null; }
         public static Azure.Monitor.Query.Models.MetricAvailability MetricAvailability(System.TimeSpan? timeGrain = default(System.TimeSpan?), System.TimeSpan? retention = default(System.TimeSpan?)) { throw null; }
-        public static Azure.Monitor.Query.Models.MetricQueryResult MetricQueryResult(int? cost = default(int?), string Timespan = null, System.TimeSpan? interval = default(System.TimeSpan?), string @namespace = null, string resourceRegion = null, System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.Metric> metrics = null) { throw null; }
         public static Azure.Monitor.Query.Models.MetricValue MetricValue(System.DateTimeOffset timeStamp = default(System.DateTimeOffset), double? average = default(double?), double? minimum = default(double?), double? maximum = default(double?), double? total = default(double?), double? count = default(double?)) { throw null; }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs
index 2d38cedf6f33..ed55df97004e 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs
@@ -6,8 +6,6 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.Text.Json;
 using Azure.Monitor.Query.Models;
 
 namespace Azure.Monitor.Query
@@ -15,29 +13,6 @@ namespace Azure.Monitor.Query
     /// <summary> Model factory for read-only models. </summary>
     public static partial class QueryModelFactory
     {
-        /// <summary> Initializes new instance of LogsQueryResult class. </summary>
-        /// <param name="tables"> The list of tables, columns and rows. </param>
-        /// <param name="Statistics"> Any object. </param>
-        /// <param name="Visualization"> Any object. </param>
-        /// <param name="Error"> Any object. </param>
-        /// <returns> A new <see cref="Models.LogsQueryResult"/> instance for mocking. </returns>
-        public static LogsQueryResult LogsQueryResult(IReadOnlyList<LogsQueryResultTable> tables = default, JsonElement Statistics = default, JsonElement Visualization = default, JsonElement Error = default)
-        {
-            tables ??= new List<LogsQueryResultTable>();
-            return new LogsQueryResult(tables, Statistics, Visualization, Error);
-        }
-
-        /// <summary> Initializes new instance of LogsQueryResultTable class. </summary>
-        /// <param name="name"> The name of the table. </param>
-        /// <param name="columns"> The list of columns in this table. </param>
-        /// <param name="internalRows"> The resulting rows from this query. </param>
-        /// <returns> A new <see cref="Models.LogsQueryResultTable"/> instance for mocking. </returns>
-        public static LogsQueryResultTable LogsQueryResultTable(string name = default, IReadOnlyList<LogsQueryResultColumn> columns = default, JsonElement internalRows = default)
-        {
-            columns ??= new List<LogsQueryResultColumn>();
-            return new LogsQueryResultTable(name, columns, internalRows);
-        }
-
         /// <summary> Initializes new instance of LogsQueryResultColumn class. </summary>
         /// <param name="name"> The name of this column. </param>
         /// <param name="type"> The data type of this column. </param>
@@ -56,20 +31,6 @@ public static MetricAvailability MetricAvailability(TimeSpan? timeGrain = defaul
             return new MetricAvailability(timeGrain, retention);
         }
 
-        /// <summary> Initializes new instance of MetricQueryResult class. </summary>
-        /// <param name="cost"> The integer value representing the relative cost of the query. </param>
-        /// <param name="Timespan"> The timespan for which the data was retrieved. Its value consists of two datetimes concatenated, separated by &apos;/&apos;.  This may be adjusted in the future and returned back from what was originally requested. </param>
-        /// <param name="interval"> The interval (window size) for which the metric data was returned in.  This may be adjusted in the future and returned back from what was originally requested.  This is not present if a metadata request was made. </param>
-        /// <param name="namespace"> The namespace of the metrics being queried. </param>
-        /// <param name="resourceRegion"> The region of the resource being queried for metrics. </param>
-        /// <param name="metrics"> the value of the collection. </param>
-        /// <returns> A new <see cref="Models.MetricQueryResult"/> instance for mocking. </returns>
-        public static MetricQueryResult MetricQueryResult(int? cost = default, string Timespan = default, TimeSpan? interval = default, string @namespace = default, string resourceRegion = default, IReadOnlyList<Metric> metrics = default)
-        {
-            metrics ??= new List<Metric>();
-            return new MetricQueryResult(cost, Timespan, interval, @namespace, resourceRegion, metrics);
-        }
-
         /// <summary> Initializes new instance of MetricValue class. </summary>
         /// <param name="timeStamp"> the timestamp for the metric value in ISO 8601 format. </param>
         /// <param name="average"> the average value in the time range. </param>
diff --git a/sdk/objectanchors/Azure.MixedReality.ObjectAnchors.Conversion/src/Generated/AOAFrontEndAPIsModelFactory.cs b/sdk/objectanchors/Azure.MixedReality.ObjectAnchors.Conversion/src/Generated/AOAFrontEndAPIsModelFactory.cs
deleted file mode 100644
index 01f544ba9138..000000000000
--- a/sdk/objectanchors/Azure.MixedReality.ObjectAnchors.Conversion/src/Generated/AOAFrontEndAPIsModelFactory.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-
-namespace Azure.MixedReality.ObjectAnchors.Conversion
-{
-    /// <summary> Model factory for read-only models. </summary>
-    internal static partial class AOAFrontEndAPIsModelFactory
-    {
-        /// <summary> Initializes new instance of AssetConversionProperties class. </summary>
-        /// <param name="clientErrorDetails"> Information about the cause of a ClientError JobStatus. </param>
-        /// <param name="serverErrorDetails"> Information about the cause of a ServerError JobStatus. </param>
-        /// <param name="errorCode"> . </param>
-        /// <param name="jobIdInternal"> Identifier for the AOA asset conversion job. </param>
-        /// <param name="outputModelUriString"> The URI for downloading the generated AOA Model. </param>
-        /// <param name="conversionStatus"> . </param>
-        /// <param name="assetFileTypeString"> The file type of the original 3D asset. Examples include: &quot;ply&quot;, &quot;obj&quot;, &quot;fbx&quot;, &quot;glb&quot;, &quot;gltf&quot;, etc. </param>
-        /// <param name="inputAssetUriString"> The Uri to the Asset to be ingested by the AOA asset conversion service. This asset needs to have been uploaded to the service using an endpoint provided from a call to the GetUploadUri API. </param>
-        /// <param name="accountIdInternal"> Identifier for the Account owning the asset conversion job. </param>
-        /// <param name="conversionConfiguration"> Represents an ingestion configuration. </param>
-        /// <returns> A new <see cref="Conversion.AssetConversionProperties"/> instance for mocking. </returns>
-        public static AssetConversionProperties AssetConversionProperties(string clientErrorDetails = default, string serverErrorDetails = default, ConversionErrorCode errorCode = default, Guid? jobIdInternal = default, string outputModelUriString = default, AssetConversionStatus? conversionStatus = default, string assetFileTypeString = default, string inputAssetUriString = default, Guid? accountIdInternal = default, AssetConversionConfiguration conversionConfiguration = default)
-        {
-            return new AssetConversionProperties(clientErrorDetails, serverErrorDetails, errorCode, jobIdInternal, outputModelUriString, conversionStatus, assetFileTypeString, inputAssetUriString, accountIdInternal, conversionConfiguration);
-        }
-
-        /// <summary> Initializes new instance of AssetUploadUriResult class. </summary>
-        /// <param name="uploadUriString"> The blob upload URI where a model should be uploaded to the service for ingestion. </param>
-        /// <returns> A new <see cref="Conversion.AssetUploadUriResult"/> instance for mocking. </returns>
-        public static AssetUploadUriResult AssetUploadUriResult(string uploadUriString = default)
-        {
-            return new AssetUploadUriResult(uploadUriString);
-        }
-    }
-}
diff --git a/sdk/remoterendering/Azure.MixedReality.RemoteRendering/api/Azure.MixedReality.RemoteRendering.netstandard2.0.cs b/sdk/remoterendering/Azure.MixedReality.RemoteRendering/api/Azure.MixedReality.RemoteRendering.netstandard2.0.cs
index 1b3ddc3f1301..60d9994988c0 100644
--- a/sdk/remoterendering/Azure.MixedReality.RemoteRendering/api/Azure.MixedReality.RemoteRendering.netstandard2.0.cs
+++ b/sdk/remoterendering/Azure.MixedReality.RemoteRendering/api/Azure.MixedReality.RemoteRendering.netstandard2.0.cs
@@ -72,13 +72,6 @@ public AssetConversionOutputOptions(System.Uri storageContainerUri) { }
         public static bool operator !=(Azure.MixedReality.RemoteRendering.AssetConversionStatus left, Azure.MixedReality.RemoteRendering.AssetConversionStatus right) { throw null; }
         public override string ToString() { throw null; }
     }
-    public static partial class MixedRealityRemoteRenderingModelFactory
-    {
-        public static Azure.MixedReality.RemoteRendering.AssetConversion AssetConversion(string conversionId = null, Azure.MixedReality.RemoteRendering.AssetConversionOptions options = null, Azure.MixedReality.RemoteRendering.AssetConversionOutput output = null, Azure.MixedReality.RemoteRendering.RemoteRenderingServiceError error = null, Azure.MixedReality.RemoteRendering.AssetConversionStatus status = default(Azure.MixedReality.RemoteRendering.AssetConversionStatus), System.DateTimeOffset createdOn = default(System.DateTimeOffset)) { throw null; }
-        public static Azure.MixedReality.RemoteRendering.AssetConversionOutput AssetConversionOutput(string outputAssetUri = null) { throw null; }
-        public static Azure.MixedReality.RemoteRendering.RemoteRenderingServiceError RemoteRenderingServiceError(string code = null, string message = null, System.Collections.Generic.IReadOnlyList<Azure.MixedReality.RemoteRendering.RemoteRenderingServiceError> details = null, string target = null, Azure.MixedReality.RemoteRendering.RemoteRenderingServiceError innerError = null) { throw null; }
-        public static Azure.MixedReality.RemoteRendering.RenderingSession RenderingSession(string sessionId = null, int? arrInspectorPort = default(int?), int? handshakePort = default(int?), int? elapsedTimeMinutes = default(int?), string host = null, int? maxLeaseTimeMinutes = default(int?), Azure.MixedReality.RemoteRendering.RenderingServerSize size = default(Azure.MixedReality.RemoteRendering.RenderingServerSize), Azure.MixedReality.RemoteRendering.RenderingSessionStatus status = default(Azure.MixedReality.RemoteRendering.RenderingSessionStatus), float? teraflops = default(float?), Azure.MixedReality.RemoteRendering.RemoteRenderingServiceError error = null, System.DateTimeOffset? createdOn = default(System.DateTimeOffset?)) { throw null; }
-    }
     public partial class RemoteRenderingClient
     {
         protected RemoteRenderingClient() { }
diff --git a/sdk/remoterendering/Azure.MixedReality.RemoteRendering/src/Customizations/Models/RemoteRenderingModelFactory.cs b/sdk/remoterendering/Azure.MixedReality.RemoteRendering/src/Customizations/Models/RemoteRenderingModelFactory.cs
index 0c01a8bd1785..3926ef98648c 100644
--- a/sdk/remoterendering/Azure.MixedReality.RemoteRendering/src/Customizations/Models/RemoteRenderingModelFactory.cs
+++ b/sdk/remoterendering/Azure.MixedReality.RemoteRendering/src/Customizations/Models/RemoteRenderingModelFactory.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
+using Azure.Core;
+
+[assembly: CodeGenSuppressType("MixedRealityRemoteRenderingModelFactory")]
 
 namespace Azure.MixedReality.RemoteRendering
 {
diff --git a/sdk/remoterendering/Azure.MixedReality.RemoteRendering/src/Generated/MixedRealityRemoteRenderingModelFactory.cs b/sdk/remoterendering/Azure.MixedReality.RemoteRendering/src/Generated/MixedRealityRemoteRenderingModelFactory.cs
deleted file mode 100644
index a46608582b97..000000000000
--- a/sdk/remoterendering/Azure.MixedReality.RemoteRendering/src/Generated/MixedRealityRemoteRenderingModelFactory.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.MixedReality.RemoteRendering
-{
-    /// <summary> Model factory for read-only models. </summary>
-    public static partial class MixedRealityRemoteRenderingModelFactory
-    {
-        /// <summary> Initializes new instance of AssetConversion class. </summary>
-        /// <param name="conversionId"> The ID of the conversion supplied when the conversion was created. </param>
-        /// <param name="options"> Conversion settings describe the origin of input files and destination of output files. </param>
-        /// <param name="output"> Information about the output of a successful conversion. Only present when the status of the conversion is &apos;Succeeded&apos;. </param>
-        /// <param name="error"> The error object containing details about the conversion failure. </param>
-        /// <param name="status"> The status of the conversion. Terminal states are &apos;Cancelled&apos;, &apos;Failed&apos;, and &apos;Succeeded&apos;. </param>
-        /// <param name="createdOn"> The time when the conversion was created. Date and time in ISO 8601 format. </param>
-        /// <returns> A new <see cref="RemoteRendering.AssetConversion"/> instance for mocking. </returns>
-        public static AssetConversion AssetConversion(string conversionId = default, AssetConversionOptions options = default, AssetConversionOutput output = default, RemoteRenderingServiceError error = default, AssetConversionStatus status = default, DateTimeOffset createdOn = default)
-        {
-            return new AssetConversion(conversionId, options, output, error, status, createdOn);
-        }
-
-        /// <summary> Initializes new instance of AssetConversionOutput class. </summary>
-        /// <param name="outputAssetUri"> URI of the asset generated by the conversion process. </param>
-        /// <returns> A new <see cref="RemoteRendering.AssetConversionOutput"/> instance for mocking. </returns>
-        public static AssetConversionOutput AssetConversionOutput(string outputAssetUri = default)
-        {
-            return new AssetConversionOutput(outputAssetUri);
-        }
-
-        /// <summary> Initializes new instance of RemoteRenderingServiceError class. </summary>
-        /// <param name="code"> Error code. </param>
-        /// <param name="message"> A human-readable representation of the error. </param>
-        /// <param name="details"> An array of details about specific errors that led to this reported error. </param>
-        /// <param name="target"> The target of the particular error (e.g., the name of the property in error). </param>
-        /// <param name="innerError"> An object containing more specific information than the current object about the error. </param>
-        /// <returns> A new <see cref="RemoteRendering.RemoteRenderingServiceError"/> instance for mocking. </returns>
-        public static RemoteRenderingServiceError RemoteRenderingServiceError(string code = default, string message = default, IReadOnlyList<RemoteRenderingServiceError> details = default, string target = default, RemoteRenderingServiceError innerError = default)
-        {
-            details ??= new List<RemoteRenderingServiceError>();
-            return new RemoteRenderingServiceError(code, message, details, target, innerError);
-        }
-
-        /// <summary> Initializes new instance of RenderingSession class. </summary>
-        /// <param name="sessionId"> The ID of the session supplied when the session was created. </param>
-        /// <param name="arrInspectorPort"> The TCP port at which the Azure Remote Rendering Inspector tool is hosted. </param>
-        /// <param name="handshakePort"> The TCP port used for the handshake when establishing a connection. </param>
-        /// <param name="elapsedTimeMinutes"> Amount of time in minutes the session is or was in the &apos;Ready&apos; state. Time is rounded down to a full minute. </param>
-        /// <param name="host"> The hostname under which the rendering session is reachable. </param>
-        /// <param name="maxLeaseTimeMinutes"> The time in minutes the session will run after reaching the &apos;Ready&apos; state. </param>
-        /// <param name="size"> The size of the server used for the rendering session. The size impacts the number of polygons the server can render. Refer to https://docs.microsoft.com/azure/remote-rendering/reference/vm-sizes for details. </param>
-        /// <param name="status"> The status of the rendering session. Terminal states are &apos;Error&apos;, &apos;Expired&apos;, and &apos;Stopped&apos;. </param>
-        /// <param name="teraflops"> The computational power of the rendering session GPU measured in teraflops. </param>
-        /// <param name="error"> The error object containing details about the rendering session startup failure. </param>
-        /// <param name="createdOn"> The time when the rendering session was created. Date and time in ISO 8601 format. </param>
-        /// <returns> A new <see cref="RemoteRendering.RenderingSession"/> instance for mocking. </returns>
-        public static RenderingSession RenderingSession(string sessionId = default, int? arrInspectorPort = default, int? handshakePort = default, int? elapsedTimeMinutes = default, string host = default, int? maxLeaseTimeMinutes = default, RenderingServerSize size = default, RenderingSessionStatus status = default, float? teraflops = default, RemoteRenderingServiceError error = default, DateTimeOffset? createdOn = default)
-        {
-            return new RenderingSession(sessionId, arrInspectorPort, handshakePort, elapsedTimeMinutes, host, maxLeaseTimeMinutes, size, status, teraflops, error, createdOn);
-        }
-    }
-}
diff --git a/sdk/tables/Azure.Data.Tables/src/Generated/TableModelFactory.cs b/sdk/tables/Azure.Data.Tables/src/Generated/TableModelFactory.cs
index 5f0cb5e8dc88..85aa221f2880 100644
--- a/sdk/tables/Azure.Data.Tables/src/Generated/TableModelFactory.cs
+++ b/sdk/tables/Azure.Data.Tables/src/Generated/TableModelFactory.cs
@@ -12,17 +12,6 @@ namespace Azure.Data.Tables.Models
     /// <summary> Model factory for read-only models. </summary>
     public static partial class TableModelFactory
     {
-        /// <summary> Initializes new instance of TableItem class. </summary>
-        /// <param name="name"> The name of the table. </param>
-        /// <param name="odataType"> The odata type of the table. </param>
-        /// <param name="odataId"> The id of the table. </param>
-        /// <param name="odataEditLink"> The edit link of the table. </param>
-        /// <returns> A new <see cref="Models.TableItem"/> instance for mocking. </returns>
-        public static TableItem TableItem(string name = default, string odataType = default, string odataId = default, string odataEditLink = default)
-        {
-            return new TableItem(name, odataType, odataId, odataEditLink);
-        }
-
         /// <summary> Initializes new instance of TableServiceStatistics class. </summary>
         /// <param name="geoReplication"> Geo-Replication information for the Secondary Storage Service. </param>
         /// <returns> A new <see cref="Models.TableServiceStatistics"/> instance for mocking. </returns>
diff --git a/sdk/tables/Azure.Data.Tables/src/TableModelFactory.cs b/sdk/tables/Azure.Data.Tables/src/TableModelFactory.cs
index a116eb5b94e4..fd36c6dbe634 100644
--- a/sdk/tables/Azure.Data.Tables/src/TableModelFactory.cs
+++ b/sdk/tables/Azure.Data.Tables/src/TableModelFactory.cs
@@ -7,5 +7,16 @@ namespace Azure.Data.Tables.Models
 {
     [CodeGenModel("AzureDataTablesModelFactory")]
     public partial class TableModelFactory
-    { }
+    {
+        /// <summary> Initializes new instance of TableItem class. </summary>
+        /// <param name="name"> The name of the table. </param>
+        /// <param name="odataType"> The odata type of the table. </param>
+        /// <param name="odataId"> The id of the table. </param>
+        /// <param name="odataEditLink"> The edit link of the table. </param>
+        /// <returns> A new <see cref="Models.TableItem"/> instance for mocking. </returns>
+        public static TableItem TableItem(string name = default, string odataType = default, string odataId = default, string odataEditLink = default)
+        {
+            return new TableItem(name, odataType, odataId, odataEditLink);
+        }
+    }
 }
diff --git a/sdk/translation/Azure.AI.Translation.Document/api/Azure.AI.Translation.Document.netstandard2.0.cs b/sdk/translation/Azure.AI.Translation.Document/api/Azure.AI.Translation.Document.netstandard2.0.cs
index 386d5a0978ec..d7378d6dd24b 100644
--- a/sdk/translation/Azure.AI.Translation.Document/api/Azure.AI.Translation.Document.netstandard2.0.cs
+++ b/sdk/translation/Azure.AI.Translation.Document/api/Azure.AI.Translation.Document.netstandard2.0.cs
@@ -2,7 +2,6 @@ namespace Azure.AI.Translation.Document
 {
     public static partial class BatchDocumentTranslationModelFactory
     {
-        public static Azure.AI.Translation.Document.DocumentStatus DocumentStatus(System.Uri translatedDocumentUri = null, System.Uri sourceDocumentUri = null, System.DateTimeOffset createdOn = default(System.DateTimeOffset), System.DateTimeOffset lastModified = default(System.DateTimeOffset), Azure.AI.Translation.Document.DocumentTranslationStatus status = default(Azure.AI.Translation.Document.DocumentTranslationStatus), string translatedTo = null, Azure.AI.Translation.Document.DocumentTranslationError error = null, float progress = 0f, string id = null, long charactersCharged = (long)0) { throw null; }
         public static Azure.AI.Translation.Document.FileFormat FileFormat(string format = null, System.Collections.Generic.IReadOnlyList<string> fileExtensions = null, System.Collections.Generic.IReadOnlyList<string> contentTypes = null, string defaultFormatVersion = null, System.Collections.Generic.IReadOnlyList<string> formatVersions = null) { throw null; }
     }
     public partial class DocumentFilter
diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/BatchDocumentTranslationModelFactory.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/BatchDocumentTranslationModelFactory.cs
index f49ffe0d447e..991e549d439d 100644
--- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/BatchDocumentTranslationModelFactory.cs
+++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/BatchDocumentTranslationModelFactory.cs
@@ -5,7 +5,6 @@
 
 #nullable disable
 
-using System;
 using System.Collections.Generic;
 
 namespace Azure.AI.Translation.Document
@@ -13,23 +12,6 @@ namespace Azure.AI.Translation.Document
     /// <summary> Model factory for read-only models. </summary>
     public static partial class BatchDocumentTranslationModelFactory
     {
-        /// <summary> Initializes new instance of DocumentStatus class. </summary>
-        /// <param name="translatedDocumentUri"> Location of the document or folder. </param>
-        /// <param name="sourceDocumentUri"> Location of the source document. </param>
-        /// <param name="createdOn"> Operation created date time. </param>
-        /// <param name="lastModified"> Date time in which the operation&apos;s status has been updated. </param>
-        /// <param name="status"> List of possible statuses for job or document. </param>
-        /// <param name="translatedTo"> To language. </param>
-        /// <param name="error"> This contains an outer error with error code, message, details, target and an inner error with more descriptive details. </param>
-        /// <param name="progress"> Progress of the translation if available. </param>
-        /// <param name="id"> Document Id. </param>
-        /// <param name="charactersCharged"> Character charged by the API. </param>
-        /// <returns> A new <see cref="Document.DocumentStatus"/> instance for mocking. </returns>
-        public static DocumentStatus DocumentStatus(Uri translatedDocumentUri = default, Uri sourceDocumentUri = default, DateTimeOffset createdOn = default, DateTimeOffset lastModified = default, DocumentTranslationStatus status = default, string translatedTo = default, DocumentTranslationError error = default, float progress = default, string id = default, long charactersCharged = default)
-        {
-            return new DocumentStatus(translatedDocumentUri, sourceDocumentUri, createdOn, lastModified, status, translatedTo, error, progress, id, charactersCharged);
-        }
-
         /// <summary> Initializes new instance of FileFormat class. </summary>
         /// <param name="format"> Name of the format. </param>
         /// <param name="fileExtensions"> Supported file extension for this format. </param>